From 23c74449a2793da00a41d1abf35cfe1c99f660a4 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 15 Jan 2020 19:27:21 +0100
Subject: [PATCH] rustup

---
 rust-version            | 2 +-
 src/helpers.rs          | 4 ++--
 src/shims/intrinsics.rs | 4 ++--
 src/shims/panic.rs      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rust-version b/rust-version
index d1b498871e87..09255212910c 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-adc65725004c8aac16392fe4052c3e347181157d
+31dd4f4acbcbdb02b0745d2136399ed664a28050
diff --git a/src/helpers.rs b/src/helpers.rs
index ff9a16a02456..fba933d278d2 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -76,7 +76,7 @@ fn test_null(&self, val: Scalar<Tag>) -> InterpResult<'tcx, Option<Scalar<Tag>>>
     /// 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 @@ fn write_packed_immediates(
         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;
         }
diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs
index a7aec53c37de..151edfda4318 100644
--- a/src/shims/intrinsics.rs
+++ b/src/shims/intrinsics.rs
@@ -409,7 +409,7 @@ fn call_intrinsic(
                         _ => {
                             // 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 @@ fn call_intrinsic(
                         _ => {
                             // 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(
diff --git a/src/shims/panic.rs b/src/shims/panic.rs
index 950a23aa59ca..d676f0464657 100644
--- a/src/shims/panic.rs
+++ b/src/shims/panic.rs
@@ -132,7 +132,7 @@ fn handle_stack_pop(
             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())?;