update for MUT_STATIC_KIND

Author: RalfJung

src/lib.rs

@@ -274,10 +274,12 @@ impl<'tcx> Hash for MemoryData<'tcx> {
     }
 }
 
-impl<'mir, 'tcx: 'mir> Machine<'mir, 'tcx> for Evaluator<'tcx> {
+impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'tcx> {
     type MemoryData = MemoryData<'tcx>;
     type MemoryKinds = memory::MemoryKind;
 
+    const MUT_STATIC_KIND: Option<memory::MemoryKind> = Some(memory::MemoryKind::MutStatic);
+
     /// Returns Ok() when the function was handled, fail otherwise
     fn find_fn<'a>(
         ecx: &mut EvalContext<'a, 'mir, 'tcx, Self>,
@@ -309,15 +311,6 @@ impl<'mir, 'tcx: 'mir> Machine<'mir, 'tcx> for Evaluator<'tcx> {
         ecx.ptr_op(bin_op, left, left_layout, right, right_layout)
     }
 
-    fn access_static_mut<'a, 'm>(
-        mem: &'m mut Memory<'a, 'mir, 'tcx, Self>,
-        id: AllocId,
-    ) -> EvalResult<'tcx, &'m mut Allocation> {
-        // Make a copy, use that.
-        mem.deep_copy_static(id, MiriMemoryKind::MutStatic.into())?;
-        mem.get_mut(id) // this is recursive, but now we know that `id` is in `alloc_map` now
-    }
-
     fn box_alloc<'a>(
         ecx: &mut EvalContext<'a, 'mir, 'tcx, Self>,
         dest: PlaceTy<'tcx>,

src/memory.rs

@@ -1,5 +1,3 @@
-use rustc_mir::interpret::IsStatic;
-
 #[derive(Debug, PartialEq, Copy, Clone, Hash, Eq)]
 pub enum MemoryKind {
     /// `__rust_alloc` memory
@@ -12,15 +10,6 @@ pub enum MemoryKind {
     MutStatic,
 }
 
-impl IsStatic for MemoryKind {
-    fn is_static(self) -> bool {
-        match self {
-            MemoryKind::MutStatic => true,
-            _ => false,
-        }
-    }
-}
-
 impl Into<::rustc_mir::interpret::MemoryKind<MemoryKind>> for MemoryKind {
     fn into(self) -> ::rustc_mir::interpret::MemoryKind<MemoryKind> {
         ::rustc_mir::interpret::MemoryKind::Machine(self)