Rollup merge of #96129 - mattheww:2022-04_float_rounding, r=Dylan-DPC

[rust.git] / library / std / src / backtrace.rs

diff --git a/library/std/src/backtrace.rs b/library/std/src/backtrace.rs
index 94e6070c0f794f70d5b11226c492e6315cbcc37b..05e9b2eb6bc3cb64b513a7d0a1b454ce4d475f5d 100644 (file)
--- 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),
         }
     }
 }