user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unsafe from naked_asm! blocks

Browse source 
This was changed in a recent nightly so the unsafety is only in the
attribute, `#[unsafe(naked)]`.
This commit is contained in:
Trevor Gross 2025-04-21 06:35:12 +00:00 • committed by Trevor Gross
parent cf13785636
commit 97ddaca356
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
library/compiler-builtins/compiler-builtins/src/aarch64_linux.rs
View file

@ -136,7 +136,7 @@ macro_rules! compare_and_swap {
expected: int_ty!($bytes), desired: int_ty!($bytes), ptr: *mut int_ty!($bytes)
) -> int_ty!($bytes) {
// We can't use `AtomicI8::compare_and_swap`; we *are* compare_and_swap.
unsafe { core::arch::naked_asm! {
core::arch::naked_asm! {
// UXT s(tmp0), s(0)
concat!(uxt!($bytes), " ", reg!($bytes, 16), ", ", reg!($bytes, 0)),
"0:",
@ -150,7 +150,7 @@ macro_rules! compare_and_swap {
"cbnz w17, 0b",
"1:",
"ret",
} }
}
}
}
};
@ -165,7 +165,7 @@ macro_rules! compare_and_swap_i128 {
pub unsafe extern "C" fn $name (
expected: i128, desired: i128, ptr: *mut i128
) -> i128 {
unsafe { core::arch::naked_asm! {
core::arch::naked_asm! {
"mov x16, x0",
"mov x17, x1",
"0:",
@ -179,7 +179,7 @@ macro_rules! compare_and_swap_i128 {
"cbnz w15, 0b",
"1:",
"ret",
} }
}
}
}
};
@ -194,7 +194,7 @@ macro_rules! swap {
pub unsafe extern "C" fn $name (
left: int_ty!($bytes), right_ptr: *mut int_ty!($bytes)
) -> int_ty!($bytes) {
unsafe { core::arch::naked_asm! {
core::arch::naked_asm! {
// mov s(tmp0), s(0)
concat!("mov ", reg!($bytes, 16), ", ", reg!($bytes, 0)),
"0:",
@ -204,7 +204,7 @@ macro_rules! swap {
concat!(stxr!($ordering, $bytes), " w17, ", reg!($bytes, 16), ", [x1]"),
"cbnz w17, 0b",
"ret",
} }
}
}
}
};
@ -219,7 +219,7 @@ macro_rules! fetch_op {
pub unsafe extern "C" fn $name (
val: int_ty!($bytes), ptr: *mut int_ty!($bytes)
) -> int_ty!($bytes) {
unsafe { core::arch::naked_asm! {
core::arch::naked_asm! {
// mov s(tmp0), s(0)
concat!("mov ", reg!($bytes, 16), ", ", reg!($bytes, 0)),
"0:",
@ -231,7 +231,7 @@ macro_rules! fetch_op {
concat!(stxr!($ordering, $bytes), " w15, ", reg!($bytes, 17), ", [x1]"),
"cbnz w15, 0b",
"ret",
} }
}
}
}
}

3
library/compiler-builtins/compiler-builtins/src/macros.rs
View file

@ -436,11 +436,12 @@ macro_rules! intrinsics {
// FIXME: when bootstrap supports `#[unsafe(naked)]` this duplication can be removed
#[cfg(bootstrap)]
#[naked]
#[allow(unused_unsafe)]
$(#[$($attr)*])*
#[cfg_attr(not(feature = "mangled-names"), no_mangle)]
#[cfg_attr(not(any(all(windows, target_env = "gnu"), target_os = "cygwin")), linkage = "weak")]
pub unsafe extern $abi fn $name( $($argname: $ty),* ) $(-> $ret)? {
$($body)*
unsafe { $($body)* }
}
#[cfg(not(bootstrap))]