Skip to content

Commit 7b5bbb1

Browse files
committed
Update landing pad to use addr()
1 parent ade83e7 commit 7b5bbb1

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • library/std/src/sys/personality

library/std/src/sys/personality/gcc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ unsafe fn sign_lpad(context: *mut uw::_Unwind_Context, lpad: *const u8) -> *cons
9696
const SP_REG: i32 = 31;
9797

9898
unsafe {
99-
let sp = uw::_Unwind_GetGR(context, SP_REG) as u64;
100-
let mut addr = lpad as usize;
99+
let sp = uw::_Unwind_GetGR(context, SP_REG).addr() as u64;
100+
let mut addr = lpad.addr();
101101

102102
// `pacib` corresponds to `ptrauth_key_process_dependent_code` in <ptrauth.h>.
103103
core::arch::asm!(

0 commit comments

Comments
 (0)