Auto merge of #1146 - RalfJung:rustup, r=RalfJung

Rustup

Author: bors

rust-version

@@ -1 +1 @@
-adc65725004c8aac16392fe4052c3e347181157d
+6d0bb91bcba33a70fae4b0c663fb4403ed78f071

src/helpers.rs

@@ -76,7 +76,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
     /// Get the `Place` for a local
     fn local_place(&mut self, local: mir::Local) -> InterpResult<'tcx, PlaceTy<'tcx, Tag>> {
         let this = self.eval_context_mut();
-        let place = mir::Place { base: mir::PlaceBase::Local(local), projection: List::empty() };
+        let place = mir::Place { local: local, projection: List::empty() };
         this.eval_place(&place)
     }
 
@@ -349,7 +349,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         for &imm in imms {
             this.write_immediate_to_mplace(
                 *imm,
-                place.offset(offset, None, imm.layout, &*this.tcx)?,
+                place.offset(offset, MemPlaceMeta::None, imm.layout, &*this.tcx)?,
             )?;
             offset += imm.layout.size;
         }

src/shims/intrinsics.rs

@@ -409,7 +409,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(); // must be sized
+                            assert!(!mplace.layout.is_unsized());
                             this.memory.write_bytes(
                                 mplace.ptr,
                                 iter::repeat(0u8).take(dest.layout.size.bytes() as usize),
@@ -574,7 +574,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();
+                            assert!(!mplace.layout.is_unsized());
                             let ptr = mplace.ptr.assert_ptr();
                             // We know the return place is in-bounds
                             this.memory.get_raw_mut(ptr.alloc_id)?.mark_definedness(

src/shims/panic.rs

@@ -132,7 +132,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             let payload = this.machine.panic_payload.take().unwrap();
             let payload = this.ref_to_mplace(payload)?;
             let payload_data_place = payload.ptr;
-            let payload_vtable_place = payload.meta.expect("Expected fat pointer");
+            let payload_vtable_place = payload.meta.unwrap_meta();
 
             this.write_scalar(payload_data_place, unwind_data.data_place.into())?;
             this.write_scalar(payload_vtable_place, unwind_data.vtable_place.into())?;