use addr_of!

Author: GrigorenkoPV

crates/line-tables-only/src/lib.rs

@@ -3,6 +3,7 @@ mod tests {
     use backtrace::Backtrace;
     use libc::c_void;
     use std::path::Path;
+    use std::ptr::addr_of_mut;
 
     pub type Callback = extern "C" fn(data: *mut c_void);
 
@@ -49,7 +50,7 @@ mod tests {
     #[cfg_attr(windows, ignore)]
     fn backtrace_works_with_line_tables_only() {
         let mut backtrace: Option<Backtrace> = None;
-        unsafe { foo(store_backtrace, &mut backtrace as *mut _ as *mut c_void) };
+        unsafe { foo(store_backtrace, addr_of_mut!(backtrace) as *mut c_void) };
         let backtrace = backtrace.expect("backtrace");
         assert_contains(&backtrace, "foo", "src/callback.c", 13);
         assert_contains(&backtrace, "bar", "src/callback.c", 9);

src/backtrace/dbghelp.rs

@@ -162,7 +162,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
             context.ip(),
             fn_entry,
             &mut context.0,
-            &mut handler_data as *mut usize as *mut PVOID,
+            ptr::addr_of_mut!(handler_data) as *mut PVOID,
             &mut establisher_frame,
             ptr::null_mut(),
         );
@@ -172,7 +172,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
 #[cfg(any(target_arch = "x86", target_arch = "arm"))]
 #[inline(always)]
 pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
-    use core::mem;
+    use core::{mem, ptr};
 
     // Allocate necessary structures for doing the stack walk
     let process = GetCurrentProcess();
@@ -215,7 +215,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
                 process,
                 thread,
                 &mut stack_frame_ex,
-                &mut context.0 as *mut CONTEXT as PVOID,
+                ptr::addr_of_mut!(context.0) as PVOID,
                 None,
                 Some(function_table_access),
                 Some(get_module_base),
@@ -253,7 +253,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
                 process,
                 thread,
                 &mut stack_frame64,
-                &mut context.0 as *mut CONTEXT as PVOID,
+                ptr::addr_of_mut!(context.0) as PVOID,
                 None,
                 Some(function_table_access),
                 Some(get_module_base),

src/backtrace/libunwind.rs

@@ -17,6 +17,7 @@
 
 use super::super::Bomb;
 use core::ffi::c_void;
+use core::ptr::addr_of_mut;
 
 pub enum Frame {
     Raw(*mut uw::_Unwind_Context),
@@ -101,7 +102,7 @@ impl Clone for Frame {
 
 #[inline(always)]
 pub unsafe fn trace(mut cb: &mut dyn FnMut(&super::Frame) -> bool) {
-    uw::_Unwind_Backtrace(trace_fn, &mut cb as *mut _ as *mut _);
+    uw::_Unwind_Backtrace(trace_fn, addr_of_mut!(cb) as *mut _);
 
     extern "C" fn trace_fn(
         ctx: *mut uw::_Unwind_Context,
@@ -198,6 +199,8 @@ mod uw {
                 _Unwind_GetGR(ctx, 15)
             }
         } else {
+            use core::ptr::addr_of_mut;
+
             // On android and arm, the function `_Unwind_GetIP` and a bunch of
             // others are macros, so we define functions containing the
             // expansion of the macros.
@@ -242,7 +245,7 @@ mod uw {
 
             pub unsafe fn _Unwind_GetIP(ctx: *mut _Unwind_Context) -> libc::uintptr_t {
                 let mut val: _Unwind_Word = 0;
-                let ptr = &mut val as *mut _Unwind_Word;
+                let ptr = addr_of_mut!(val);
                 let _ = _Unwind_VRS_Get(
                     ctx,
                     _Unwind_VRS_RegClass::_UVRSC_CORE,
@@ -258,7 +261,7 @@ mod uw {
 
             pub unsafe fn get_sp(ctx: *mut _Unwind_Context) -> libc::uintptr_t {
                 let mut val: _Unwind_Word = 0;
-                let ptr = &mut val as *mut _Unwind_Word;
+                let ptr = addr_of_mut!(val);
                 let _ = _Unwind_VRS_Get(
                     ctx,
                     _Unwind_VRS_RegClass::_UVRSC_CORE,

src/dbghelp.rs

@@ -155,7 +155,7 @@ macro_rules! dbghelp {
 
             pub fn dbghelp(&self) -> *mut Dbghelp {
                 unsafe {
-                    &mut DBGHELP
+                    ptr::addr_of_mut!(DBGHELP)
                 }
             }
         }

src/symbolize/dbghelp.rs

@@ -222,7 +222,7 @@ unsafe fn do_resolve(
             }
         }
     }
-    let name = &name_buffer[..name_len] as *const [u8];
+    let name = core::ptr::addr_of!(name_buffer[..name_len]);
 
     let mut line = mem::zeroed::<IMAGEHLP_LINEW64>();
     line.SizeOfStruct = mem::size_of::<IMAGEHLP_LINEW64>() as DWORD;

src/symbolize/gimli/libs_dl_iterate_phdr.rs

@@ -12,7 +12,7 @@ use core::slice;
 pub(super) fn native_libraries() -> Vec<Library> {
     let mut ret = Vec::new();
     unsafe {
-        libc::dl_iterate_phdr(Some(callback), &mut ret as *mut Vec<_> as *mut _);
+        libc::dl_iterate_phdr(Some(callback), core::ptr::addr_of_mut!(ret) as *mut _);
     }
     return ret;
 }

src/symbolize/gimli/libs_illumos.rs

@@ -41,7 +41,7 @@ pub(super) fn native_libraries() -> Vec<Library> {
         if dlinfo(
             RTLD_SELF,
             RTLD_DI_LINKMAP,
-            (&mut map) as *mut *const LinkMap as *mut libc::c_void,
+            core::ptr::addr_of_mut!(map) as *mut libc::c_void,
         ) != 0
         {
             return libs;

src/symbolize/gimli/libs_libnx.rs

@@ -7,7 +7,7 @@ pub(super) fn native_libraries() -> Vec<Library> {
         static __start__: u8;
     }
 
-    let bias = unsafe { &__start__ } as *const u8 as usize;
+    let bias = core::ptr::addr_of!(__start__) as usize;
 
     let mut ret = Vec::new();
     let mut segments = Vec::new();

tests/smoke.rs

@@ -1,4 +1,5 @@
 use backtrace::Frame;
+use std::ptr;
 use std::thread;
 
 fn get_actual_fn_pointer(fp: usize) -> usize {
@@ -264,7 +265,7 @@ fn sp_smoke_test() {
         assert!(refs.len() < 5);
 
         let x = refs.len();
-        refs.push(&x as *const _ as usize);
+        refs.push(ptr::addr_of!(x) as usize);
 
         if refs.len() < 5 {
             recursive_stack_references(refs);