forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#128650 - matthiaskrgr:rollup-gvrnowj, r=matth…
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#127655 (turn `invalid_type_param_default` into a `FutureReleaseErrorReportInDeps`) - rust-lang#127974 (force compiling std from source if modified) - rust-lang#128026 (std::thread: available_parallelism implementation for vxWorks proposal.) - rust-lang#128362 (add test for symbol visibility of `#[naked]` functions) - rust-lang#128500 (Add test for updating enum discriminant through pointer) - rust-lang#128630 (docs(resolve): more explain about `target`) - rust-lang#128638 (run-make: enable msvc for `link-dedup`) r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
20 changed files
with
371 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
tests/codegen/issues/issue-122600-ptr-discriminant-update.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
//@ compile-flags: -O | ||
//@ min-llvm-version: 19 | ||
|
||
#![crate_type = "lib"] | ||
|
||
pub enum State { | ||
A([u8; 753]), | ||
B([u8; 753]), | ||
} | ||
|
||
// CHECK-LABEL: @update | ||
#[no_mangle] | ||
pub unsafe fn update(s: *mut State) { | ||
// CHECK-NEXT: start: | ||
// CHECK-NEXT: store i8 | ||
// CHECK-NEXT: ret | ||
let State::A(v) = s.read() else { std::hint::unreachable_unchecked() }; | ||
s.write(State::B(v)); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
#![feature(naked_functions, asm_const, linkage)] | ||
#![crate_type = "dylib"] | ||
|
||
use std::arch::asm; | ||
|
||
pub trait TraitWithConst { | ||
const COUNT: u32; | ||
} | ||
|
||
struct Test; | ||
|
||
impl TraitWithConst for Test { | ||
const COUNT: u32 = 1; | ||
} | ||
|
||
#[no_mangle] | ||
fn entry() { | ||
private_vanilla_rust_function_from_rust_dylib(); | ||
private_naked_rust_function_from_rust_dylib(); | ||
|
||
public_vanilla_generic_function_from_rust_dylib::<Test>(); | ||
public_naked_generic_function_from_rust_dylib::<Test>(); | ||
} | ||
|
||
extern "C" fn private_vanilla_rust_function_from_rust_dylib() -> u32 { | ||
42 | ||
} | ||
|
||
#[no_mangle] | ||
pub extern "C" fn public_vanilla_rust_function_from_rust_dylib() -> u32 { | ||
42 | ||
} | ||
|
||
pub extern "C" fn public_vanilla_generic_function_from_rust_dylib<T: TraitWithConst>() -> u32 { | ||
T::COUNT | ||
} | ||
|
||
#[linkage = "weak"] | ||
extern "C" fn vanilla_weak_linkage() -> u32 { | ||
42 | ||
} | ||
|
||
#[linkage = "external"] | ||
extern "C" fn vanilla_external_linkage() -> u32 { | ||
42 | ||
} | ||
|
||
#[naked] | ||
extern "C" fn private_naked_rust_function_from_rust_dylib() -> u32 { | ||
unsafe { asm!("mov rax, 42", "ret", options(noreturn)) } | ||
} | ||
|
||
#[naked] | ||
#[no_mangle] | ||
pub extern "C" fn public_naked_rust_function_from_rust_dylib() -> u32 { | ||
unsafe { asm!("mov rax, 42", "ret", options(noreturn)) } | ||
} | ||
|
||
#[naked] | ||
pub extern "C" fn public_naked_generic_function_from_rust_dylib<T: TraitWithConst>() -> u32 { | ||
unsafe { asm!("mov rax, {}", "ret", const T::COUNT, options(noreturn)) } | ||
} | ||
|
||
#[naked] | ||
#[linkage = "weak"] | ||
extern "C" fn naked_weak_linkage() -> u32 { | ||
unsafe { asm!("mov rax, 42", "ret", options(noreturn)) } | ||
} | ||
|
||
#[naked] | ||
#[linkage = "external"] | ||
extern "C" fn naked_external_linkage() -> u32 { | ||
unsafe { asm!("mov rax, 42", "ret", options(noreturn)) } | ||
} | ||
|
||
// functions that are declared in an `extern "C"` block are currently not exported | ||
// this maybe should change in the future, this is just tracking the current behavior | ||
// reported in https://github.com/rust-lang/rust/issues/128071 | ||
std::arch::global_asm! { | ||
".globl function_defined_in_global_asm", | ||
"function_defined_in_global_asm:", | ||
"ret", | ||
} | ||
|
||
extern "C" { | ||
pub fn function_defined_in_global_asm(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
//@ only-x86_64 | ||
use run_make_support::object::read::{File, Object, Symbol}; | ||
use run_make_support::object::ObjectSymbol; | ||
use run_make_support::{dynamic_lib_name, rfs, rustc}; | ||
|
||
fn main() { | ||
let rdylib_name = dynamic_lib_name("a_rust_dylib"); | ||
rustc().arg("-Zshare-generics=no").input("a_rust_dylib.rs").run(); | ||
|
||
let binary_data = rfs::read(&rdylib_name); | ||
let rdylib = File::parse(&*binary_data).unwrap(); | ||
|
||
// check vanilla symbols | ||
not_exported(&rdylib, "private_vanilla_rust_function_from_rust_dylib"); | ||
global_function(&rdylib, "public_vanilla_rust_function_from_rust_dylib"); | ||
not_exported(&rdylib, "public_vanilla_generic_function_from_rust_dylib"); | ||
|
||
weak_function(&rdylib, "vanilla_weak_linkage"); | ||
global_function(&rdylib, "vanilla_external_linkage"); | ||
|
||
// naked should mirror vanilla | ||
not_exported(&rdylib, "private_naked_rust_function_from_rust_dylib"); | ||
global_function(&rdylib, "public_naked_rust_function_from_rust_dylib"); | ||
not_exported(&rdylib, "public_naked_generic_function_from_rust_dylib"); | ||
|
||
weak_function(&rdylib, "naked_weak_linkage"); | ||
global_function(&rdylib, "naked_external_linkage"); | ||
|
||
// functions that are declared in an `extern "C"` block are currently not exported | ||
// this maybe should change in the future, this is just tracking the current behavior | ||
// reported in https://github.com/rust-lang/rust/issues/128071 | ||
not_exported(&rdylib, "function_defined_in_global_asm"); | ||
|
||
// share generics should expose the generic functions | ||
rustc().arg("-Zshare-generics=yes").input("a_rust_dylib.rs").run(); | ||
let binary_data = rfs::read(&rdylib_name); | ||
let rdylib = File::parse(&*binary_data).unwrap(); | ||
|
||
global_function(&rdylib, "public_vanilla_generic_function_from_rust_dylib"); | ||
global_function(&rdylib, "public_naked_generic_function_from_rust_dylib"); | ||
} | ||
|
||
#[track_caller] | ||
fn global_function(file: &File, symbol_name: &str) { | ||
let symbols = find_dynamic_symbol(file, symbol_name); | ||
let [symbol] = symbols.as_slice() else { | ||
panic!("symbol {symbol_name} occurs {} times", symbols.len()) | ||
}; | ||
|
||
assert!(symbol.is_definition(), "`{symbol_name}` is not a function"); | ||
assert!(symbol.is_global(), "`{symbol_name}` is not marked as global"); | ||
} | ||
|
||
#[track_caller] | ||
fn weak_function(file: &File, symbol_name: &str) { | ||
let symbols = find_dynamic_symbol(file, symbol_name); | ||
let [symbol] = symbols.as_slice() else { | ||
panic!("symbol {symbol_name} occurs {} times", symbols.len()) | ||
}; | ||
|
||
assert!(symbol.is_definition(), "`{symbol_name}` is not a function"); | ||
assert!(symbol.is_weak(), "`{symbol_name}` is not marked as weak"); | ||
} | ||
|
||
#[track_caller] | ||
fn not_exported(file: &File, symbol_name: &str) { | ||
assert_eq!(find_dynamic_symbol(file, symbol_name).len(), 0) | ||
} | ||
|
||
fn find_dynamic_symbol<'file, 'data>( | ||
file: &'file File<'data>, | ||
expected: &str, | ||
) -> Vec<Symbol<'data, 'file>> { | ||
file.dynamic_symbols() | ||
.filter(|symbol| { | ||
let name = symbol.name().unwrap(); | ||
!name.contains("__imp_") && name.contains(expected) | ||
}) | ||
.collect() | ||
} |
21 changes: 0 additions & 21 deletions
21
tests/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.