Remove all uses of to_ptr

Author: oli-obk

src/shims/env.rs

@@ -44,7 +44,7 @@ fn alloc_env_var<'mir, 'tcx>(
     bytes.push(b'=');
     bytes.extend_from_slice(value);
     bytes.push(0);
-    memory.allocate_static_bytes(bytes.as_slice(), MiriMemoryKind::Env.into())
+    memory.allocate_static_bytes(bytes.as_slice(), MiriMemoryKind::Env.into()).assert_ptr()
 }
 
 impl<'mir, 'tcx> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}

src/shims/foreign_items.rs

@@ -81,25 +81,21 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             if new_size == 0 {
                 Ok(Scalar::from_int(0, this.pointer_size()))
             } else {
-                let new_ptr =
-                    this.memory
-                        .allocate(Size::from_bytes(new_size), new_align, kind.into());
-                Ok(Scalar::Ptr(new_ptr))
+                Ok(this.memory.allocate(Size::from_bytes(new_size), new_align, kind.into()))
             }
         } else {
             let old_ptr = this.force_ptr(old_ptr)?;
             if new_size == 0 {
                 this.memory.deallocate(old_ptr, None, kind.into())?;
                 Ok(Scalar::from_int(0, this.pointer_size()))
             } else {
-                let new_ptr = this.memory.reallocate(
+                this.memory.reallocate(
                     old_ptr,
                     None,
                     Size::from_bytes(new_size),
                     new_align,
                     kind.into(),
-                )?;
-                Ok(Scalar::Ptr(new_ptr))
+                )
             }
         }
     }
@@ -276,7 +272,10 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 )?;
             }
             "__rust_realloc" => {
-                let ptr = this.read_scalar(args[0])?.to_ptr()?;
+                let ptr = match this.read_scalar(args[0])?.not_undef()? {
+                    Scalar::Ptr(p) => p,
+                    Scalar::Raw { .. } => throw_ub_format!("cannot reallocate integer addresses"),
+                };
                 let old_size = this.read_scalar(args[1])?.to_machine_usize(this)?;
                 let align = this.read_scalar(args[2])?.to_machine_usize(this)?;
                 let new_size = this.read_scalar(args[3])?.to_machine_usize(this)?;

src/shims/intrinsics.rs

@@ -553,7 +553,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                             // Do it in memory
                             let mplace = this.force_allocation(dest)?;
                             mplace.meta.unwrap_none();
-                            let ptr = mplace.ptr.to_ptr()?;
+                            let ptr = mplace.ptr.assert_ptr();
                             // We know the return place is in-bounds
                             this.memory
                                 .get_raw_mut(ptr.alloc_id)?

src/stacked_borrows.rs

@@ -538,7 +538,7 @@ trait EvalContextPrivExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
     ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
         let protector = if protect { Some(this.frame().extra.call_id) } else { None };
-        let ptr = place.ptr.to_ptr().expect("we should have a proper pointer");
+        let ptr = place.ptr.assert_ptr();
         trace!("reborrow: {} reference {:?} derived from {:?} (pointee {}): {:?}, size {}",
             kind, new_tag, ptr.tag, place.layout.ty, ptr.erase_tag(), size.bytes());