Differentiate between casted and transmute ptrs

rust-lang · Apr 21, 2022 · d9234b7 · d9234b7
1 parent d766294
commit d9234b7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/intptrcast.rs b/src/intptrcast.rs
@@ -98,6 +98,14 @@ impl<'mir, 'tcx> GlobalStateInner {
     }
 
     pub fn ptr_from_addr(ecx: &MiriEvalContext<'mir, 'tcx>, addr: u64) -> Pointer<Option<Tag>> {
+        trace!("Transmuting 0x{:x} to a pointer", addr);
+
+        // TODO: fix this at some point once we deal with function pointers
+        // Pointer::new(None, Size::from_bytes(addr))
+        Self::ptr_from_casted_addr(ecx, addr)
+    }
+
+    pub fn ptr_from_casted_addr(ecx: &MiriEvalContext<'mir, 'tcx>, addr: u64) -> Pointer<Option<Tag>> {
         trace!("Casting 0x{:x} to a pointer", addr);
         let global_state = ecx.machine.intptrcast.borrow();
 

diff --git a/src/machine.rs b/src/machine.rs
@@ -627,6 +627,14 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
         intptrcast::GlobalStateInner::ptr_from_addr(ecx, addr)
     }
 
+    #[inline(always)]
+    fn ptr_from_casted_addr(
+        ecx: &MiriEvalContext<'mir, 'tcx>,
+        addr: u64,
+    ) -> Pointer<Option<Self::PointerTag>> {
+        intptrcast::GlobalStateInner::ptr_from_casted_addr(ecx, addr)
+    }
+
     #[inline(always)]
     fn expose_ptr(
         ecx: &mut InterpCx<'mir, 'tcx, Self>,