rustup

Author: RalfJung

rust-version

@@ -1 +1 @@
-6077b7cda466afa2b75a62b232ab46dbeb148bcb
+db41351753df840773ca628d8daa040e95d00eef

src/helpers.rs

@@ -631,7 +631,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
 
         // Ensure that the access is within bounds.
         assert!(op_place.layout.size >= offset + layout.size);
-        let value_place = op_place.offset(offset, MemPlaceMeta::None, layout, this)?;
+        let value_place = op_place.offset(offset, layout, this)?;
         Ok(value_place)
     }
 

src/shims/backtrace.rs

@@ -105,7 +105,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                     let offset = ptr_layout.size * i.try_into().unwrap();
 
                     let op_place =
-                        buf_place.offset(offset, MemPlaceMeta::None, ptr_layout, this)?;
+                        buf_place.offset(offset, ptr_layout, this)?;
 
                     this.write_pointer(ptr, &op_place.into())?;
                 }

src/shims/windows/foreign_items.rs

@@ -154,7 +154,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 // Set page size.
                 let page_size = system_info.offset(
                     field_offsets[2],
-                    MemPlaceMeta::None,
                     dword_layout,
                     &this.tcx,
                 )?;
@@ -165,7 +164,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 // Set number of processors.
                 let num_cpus = system_info.offset(
                     field_offsets[6],
-                    MemPlaceMeta::None,
                     dword_layout,
                     &this.tcx,
                 )?;

tests/fail/stacked_borrows/issue-miri-1050-1.rs

@@ -3,6 +3,6 @@
 fn main() {
     unsafe {
         let ptr = Box::into_raw(Box::new(0u16));
-        Box::from_raw(ptr as *mut u32);
+        drop(Box::from_raw(ptr as *mut u32));
     }
 }

tests/fail/stacked_borrows/issue-miri-1050-1.stderr

@@ -12,8 +12,8 @@ LL |         Box(unsafe { Unique::new_unchecked(raw) }, alloc)
 note: inside `main` at $DIR/issue-miri-1050-1.rs:LL:CC
   --> $DIR/issue-miri-1050-1.rs:LL:CC
    |
-LL |         Box::from_raw(ptr as *mut u32);
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         drop(Box::from_raw(ptr as *mut u32));
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

tests/fail/stacked_borrows/issue-miri-1050-2.rs

@@ -4,6 +4,6 @@ use std::ptr::NonNull;
 fn main() {
     unsafe {
         let ptr = NonNull::<i32>::dangling();
-        Box::from_raw(ptr.as_ptr());
+        drop(Box::from_raw(ptr.as_ptr()));
     }
 }

tests/fail/stacked_borrows/issue-miri-1050-2.stderr

@@ -12,8 +12,8 @@ LL |         Box(unsafe { Unique::new_unchecked(raw) }, alloc)
 note: inside `main` at $DIR/issue-miri-1050-2.rs:LL:CC
   --> $DIR/issue-miri-1050-2.rs:LL:CC
    |
-LL |         Box::from_raw(ptr.as_ptr());
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         drop(Box::from_raw(ptr.as_ptr()));
+   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace