Auto merge of #1402 - rust-lang:alloc_map_unlock, r=RalfJung

Update to rustc changes

changes needed once https://github.com/rust-lang/rust/pull/71508 gets merged

rust-version

@@ -1 +1 @@
-0f9088f9610618e724cfc0cf2ba3721918be5ec9
+6f5c7827b71d1e1e4831fa7522e49acaf2a9e44e

src/machine.rs

@@ -427,7 +427,7 @@ fn adjust_global_const(
     fn canonical_alloc_id(mem: &Memory<'mir, 'tcx, Self>, id: AllocId) -> AllocId {
         let tcx = mem.tcx;
         // Figure out if this is an extern static, and if yes, which one.
-        let def_id = match tcx.alloc_map.lock().get(id) {
+        let def_id = match tcx.get_global_alloc(id) {
             Some(GlobalAlloc::Static(def_id)) if tcx.is_foreign_item(def_id) => def_id,
             _ => {
                 // No need to canonicalize anything.
@@ -494,7 +494,7 @@ fn before_deallocation(
         if Some(id) == memory_extra.tracked_alloc_id {
             register_diagnostic(NonHaltingDiagnostic::FreedAlloc(id));
         }
-        
+
         Ok(())
     }
 

src/thread.rs

@@ -428,7 +428,7 @@ fn remap_thread_local_alloc_ids(
         match *val {
             mir::interpret::ConstValue::Scalar(Scalar::Ptr(ref mut ptr)) => {
                 let alloc_id = ptr.alloc_id;
-                let alloc = this.tcx.alloc_map.lock().get(alloc_id);
+                let alloc = this.tcx.get_global_alloc(alloc_id);
                 let tcx = this.tcx;
                 let is_thread_local = |def_id| {
                     tcx.codegen_fn_attrs(def_id).flags.contains(CodegenFnAttrFlags::THREAD_LOCAL)
@@ -489,13 +489,12 @@ fn get_or_create_thread_local_alloc_id(&self, def_id: DefId) -> InterpResult<'tc
                 })?;
             let id = raw_const.alloc_id;
             // Extract the allocation from the query result.
-            let mut alloc_map = tcx.alloc_map.lock();
-            let allocation = alloc_map.unwrap_memory(id);
+            let allocation = tcx.global_alloc(id).unwrap_memory();
             // Create a new allocation id for the same allocation in this hacky
             // way. Internally, `alloc_map` deduplicates allocations, but this
             // is fine because Miri will make a copy before a first mutable
             // access.
-            let new_alloc_id = alloc_map.create_memory_alloc(allocation);
+            let new_alloc_id = tcx.create_memory_alloc(allocation);
             this.machine.threads.set_thread_local_alloc_id(def_id, new_alloc_id);
             Ok(new_alloc_id)
         }

tests/compile-fail/validity/invalid_wide_raw.rs

@@ -6,5 +6,5 @@ trait T { }
     struct S {
         x: * mut dyn T
     }
-    dbg!(S { x: unsafe { std::mem::transmute((0usize, 0usize)) } }); //~ ERROR: encountered dangling vtable pointer
+    dbg!(S { x: unsafe { std::mem::transmute((0usize, 0usize)) } }); //~ ERROR: encountered dangling vtable pointer in wide pointer
 }