Merge branch 'master' into master

diff --git a/rust-version b/rust-version
index 1999b58c89cb73db6349b36fefe71b3215b41c12..f09338fca150fc5bd7d12a8559b21e7a638faebd 100644 (file)
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-4fb77a0398d0339f35f1b18595b375428babd431
+56a12b2ad058f22f1ef090713df15598525ba4a4

diff --git a/src/lib.rs b/src/lib.rs
index 061b07478a28bcf0d2dd4f5a654c0d4e0cd07e14..9072f141f89d9d3759873c71791352741b03f83f 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -508,21 +508,21 @@ fn tag_allocation<'b>(
         id: AllocId,
         alloc: Cow<'b, Allocation>,
         kind: Option<MemoryKind<Self::MemoryKinds>>,
-        memory_extra: &Self::MemoryExtra,
+        memory: &Memory<'mir, 'tcx, Self>,
     ) -> (Cow<'b, Allocation<Self::PointerTag, Self::AllocExtra>>, Self::PointerTag) {
         let kind = kind.expect("we set our STATIC_KIND so this cannot be None");
         let alloc = alloc.into_owned();
         let (extra, base_tag) = Stacks::new_allocation(
             id,
             Size::from_bytes(alloc.bytes.len() as u64),
-            Rc::clone(memory_extra),
+            Rc::clone(&memory.extra),
             kind,
         );
         if kind != MiriMemoryKind::Static.into() {
             assert!(alloc.relocations.is_empty(), "Only statics can come initialized with inner pointers");
             // Now we can rely on the inner pointers being static, too.
         }
-        let mut memory_extra = memory_extra.borrow_mut();
+        let mut memory_extra = memory.extra.borrow_mut();
         let alloc: Allocation<Tag, Self::AllocExtra> = Allocation {
             bytes: alloc.bytes,
             relocations: Relocations::from_presorted(
@@ -543,9 +543,9 @@ fn tag_allocation<'b>(
     #[inline(always)]
     fn tag_static_base_pointer(
         id: AllocId,
-        memory_extra: &Self::MemoryExtra,
+        memory: &Memory<'mir, 'tcx, Self>,
     ) -> Self::PointerTag {
-        memory_extra.borrow_mut().static_base_ptr(id)
+        memory.extra.borrow_mut().static_base_ptr(id)
     }
 
     #[inline(always)]