nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 19:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

unwind: Apply unsafe_op_in_unsafe_fn

Browse Source
This commit is contained in:
Eric Huss 2025-02-13 12:45:31 -08:00
parent 331911e699
commit 0484d23465
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/unwind/src/lib.rs
View File

@ -9,6 +9,7 @@
)] )]
#![allow(internal_features)] #![allow(internal_features)]
#![cfg_attr(not(bootstrap), feature(cfg_emscripten_wasm_eh))] #![cfg_attr(not(bootstrap), feature(cfg_emscripten_wasm_eh))]
#![deny(unsafe_op_in_unsafe_fn)]
// Force libc to be included even if unused. This is required by many platforms. // Force libc to be included even if unused. This is required by many platforms.
#[cfg(not(all(windows, target_env = "msvc")))] #[cfg(not(all(windows, target_env = "msvc")))]

20
library/unwind/src/libunwind.rs
View File

@ -218,36 +218,38 @@ if #[cfg(any(target_vendor = "apple", target_os = "netbsd", not(target_arch = "a
pub unsafe fn _Unwind_GetGR(ctx: *mut _Unwind_Context, reg_index: c_int) -> _Unwind_Word { pub unsafe fn _Unwind_GetGR(ctx: *mut _Unwind_Context, reg_index: c_int) -> _Unwind_Word {
let mut val: _Unwind_Word = core::ptr::null(); let mut val: _Unwind_Word = core::ptr::null();
_Unwind_VRS_Get(ctx, _UVRSC_CORE, reg_index as _Unwind_Word, _UVRSD_UINT32, unsafe { _Unwind_VRS_Get(ctx, _UVRSC_CORE, reg_index as _Unwind_Word, _UVRSD_UINT32,
(&raw mut val) as *mut c_void); (&raw mut val) as *mut c_void); }
val val
} }
pub unsafe fn _Unwind_SetGR(ctx: *mut _Unwind_Context, reg_index: c_int, value: _Unwind_Word) { pub unsafe fn _Unwind_SetGR(ctx: *mut _Unwind_Context, reg_index: c_int, value: _Unwind_Word) {
let mut value = value; let mut value = value;
_Unwind_VRS_Set(ctx, _UVRSC_CORE, reg_index as _Unwind_Word, _UVRSD_UINT32, unsafe { _Unwind_VRS_Set(ctx, _UVRSC_CORE, reg_index as _Unwind_Word, _UVRSD_UINT32,
(&raw mut value) as *mut c_void); (&raw mut value) as *mut c_void); }
} }
pub unsafe fn _Unwind_GetIP(ctx: *mut _Unwind_Context) pub unsafe fn _Unwind_GetIP(ctx: *mut _Unwind_Context)
-> _Unwind_Word { -> _Unwind_Word {
let val = _Unwind_GetGR(ctx, UNWIND_IP_REG); let val = unsafe { _Unwind_GetGR(ctx, UNWIND_IP_REG) };
val.map_addr(|v| v & !1) val.map_addr(|v| v & !1)
} }
pub unsafe fn _Unwind_SetIP(ctx: *mut _Unwind_Context, pub unsafe fn _Unwind_SetIP(ctx: *mut _Unwind_Context,
value: _Unwind_Word) { value: _Unwind_Word) {
// Propagate thumb bit to instruction pointer // Propagate thumb bit to instruction pointer
let thumb_state = _Unwind_GetGR(ctx, UNWIND_IP_REG).addr() & 1; let thumb_state = unsafe { _Unwind_GetGR(ctx, UNWIND_IP_REG).addr() & 1 };
let value = value.map_addr(|v| v | thumb_state); let value = value.map_addr(|v| v | thumb_state);
_Unwind_SetGR(ctx, UNWIND_IP_REG, value); unsafe { _Unwind_SetGR(ctx, UNWIND_IP_REG, value); }
} }
pub unsafe fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context, pub unsafe fn _Unwind_GetIPInfo(ctx: *mut _Unwind_Context,
ip_before_insn: *mut c_int) ip_before_insn: *mut c_int)
-> _Unwind_Word { -> _Unwind_Word {
*ip_before_insn = 0; unsafe {
_Unwind_GetIP(ctx) *ip_before_insn = 0;
_Unwind_GetIP(ctx)
}
} }
// This function also doesn't exist on Android or ARM/Linux, so make it a no-op // This function also doesn't exist on Android or ARM/Linux, so make it a no-op