Auto merge of #60937 - RalfJung:miri, r=oli-obk

update Miri r? @oli-obk
rust-lang · May 19, 2019 · ce41e48 · ce41e48
2 parents e0d2f74 + 5f5e30f
commit ce41e48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/librustc_mir/interpret/eval_context.rs b/src/librustc_mir/interpret/eval_context.rs
@@ -613,7 +613,9 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'a, 'mir, 'tcx>> InterpretCx<'a, 'mir, 'tc
         trace!("{:?} is now live", local);
 
         let local_val = LocalValue::Uninitialized;
-        // StorageLive *always* kills the value that's currently stored
+        // StorageLive *always* kills the value that's currently stored.
+        // However, we do not error if the variable already is live;
+        // see <https://github.com/rust-lang/rust/issues/42371>.
         Ok(mem::replace(&mut self.frame_mut().locals[local].value, local_val))
     }
 

diff --git a/src/tools/miri b/src/tools/miri
+1 −1		rust-version
+1 −1		src/lib.rs
+120 −157		src/stacked_borrows.rs
+2 −3		test-cargo-miri/test.stdout.ref
+1 −1		test-cargo-miri/test.stdout.ref2
+3 −9		test-cargo-miri/tests/test.rs
+1 −1		tests/compile-fail/stacked_borrows/deallocate_against_barrier.rs
+10 −0		tests/compile-fail/stacked_borrows/interior_mut1.rs
+11 −2		tests/run-pass/stacked-borrows/interior_mutability.rs