X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=library%2Fstd%2Fsrc%2Fbacktrace.rs;h=05e9b2eb6bc3cb64b513a7d0a1b454ce4d475f5d;hb=98a8035bedd2c660912d1e6ecfe86c895e588feb;hp=94e6070c0f794f70d5b11226c492e6315cbcc37b;hpb=9412316ac39db2a91284d809e2ada9c69afe5b50;p=rust.git diff --git a/library/std/src/backtrace.rs b/library/std/src/backtrace.rs index 94e6070c0f7..05e9b2eb6bc 100644 --- a/library/std/src/backtrace.rs +++ b/library/std/src/backtrace.rs @@ -330,7 +330,7 @@ fn create(ip: usize) -> Backtrace { frame: RawFrame::Actual(frame.clone()), symbols: Vec::new(), }); - if frame.symbol_address() as usize == ip && actual_start.is_none() { + if frame.symbol_address().addr() == ip && actual_start.is_none() { actual_start = Some(frames.len()); } true @@ -493,7 +493,7 @@ fn ip(&self) -> *mut c_void { match self { RawFrame::Actual(frame) => frame.ip(), #[cfg(test)] - RawFrame::Fake => 1 as *mut c_void, + RawFrame::Fake => crate::ptr::invalid_mut(1), } } }