diff options
| author | bors <bors@rust-lang.org> | 2025-04-20 02:08:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-20 02:08:02 +0000 |
| commit | 49e5e4e3a5610c240a717cb99003a5d5d3356679 (patch) | |
| tree | f7d71ca252f47aa55dedab1ee31180dea2334d98 /compiler/rustc_codegen_cranelift/example | |
| parent | 90fd16eb5be9255006c95e8af12a0d43854dc1a9 (diff) | |
| parent | f0a0efdcdc326cf94d232b8f6f93c8e7ad2809c2 (diff) | |
Auto merge of #140043 - ChrisDenton:rollup-vwf0s9j, r=ChrisDenton
Rollup of 8 pull requests Successful merges: - #138934 (support config extensions) - #139091 (Rewrite on_unimplemented format string parser.) - #139753 (Make `#[naked]` an unsafe attribute) - #139762 (Don't assemble non-env/bound candidates if projection is rigid) - #139834 (Don't canonicalize crate paths) - #139868 (Move `pal::env` to `std::sys::env_consts`) - #139978 (Add citool command for generating a test dashboard) - #139995 (Clean UI tests 4 of n) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_cranelift/example')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/example/mini_core_hello_world.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_cranelift/example/mini_core_hello_world.rs b/compiler/rustc_codegen_cranelift/example/mini_core_hello_world.rs index 09d5b73fd3d..0b3a7281d5a 100644 --- a/compiler/rustc_codegen_cranelift/example/mini_core_hello_world.rs +++ b/compiler/rustc_codegen_cranelift/example/mini_core_hello_world.rs @@ -387,11 +387,9 @@ global_asm! { } #[cfg(all(not(jit), target_arch = "x86_64"))] -#[naked] +#[unsafe(naked)] extern "C" fn naked_test() { - unsafe { - naked_asm!("ret"); - } + naked_asm!("ret") } #[repr(C)] |