force pointers before reborrowing; fixes cargo miri test suite

Author: RalfJung

src/helpers.rs

@@ -116,7 +116,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             .map(|(size, _)| size)
             .unwrap_or_else(|| place.layout.size)
         );
-        let place = this.normalize_mplace_ptr(place)?;
         // Store how far we proceeded into the place so far. Everything to the left of
         // this offset has already been handled, in the sense that the frozen parts
         // have had `action` called on them.

src/stacked_borrows.rs

@@ -587,6 +587,7 @@ trait EvalContextPrivExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             // Nothing to do for ZSTs.
             return Ok(*val);
         }
+        let place = this.force_mplace_ptr(place)?;
 
         // Compute new borrow.
         let new_tag = match kind {

test-cargo-miri/run-test.py

@@ -52,9 +52,8 @@ def test_cargo_miri_run():
     )
 
 def test_cargo_miri_test():
-    # FIXME: enable validation again, once that no longer conflicts with intptrcast
     test("cargo miri test",
-        cargo_miri("test") + ["--", "-Zmiri-seed=feed", "-Zmiri-disable-validation"],
+        cargo_miri("test") + ["--", "-Zmiri-seed=feed"],
         "test.stdout.ref", "test.stderr.ref"
     )
     test("cargo miri test (with filter)",

tests/run-pass/unique-send.rs renamed to tests/run-pass/mpsc.rs

@@ -7,4 +7,9 @@ pub fn main() {
     tx.send(box 100).unwrap();
     let v = rx.recv().unwrap();
     assert_eq!(v, box 100);
+
+    tx.send(box 101).unwrap();
+    tx.send(box 102).unwrap();
+    assert_eq!(rx.recv().unwrap(), box 101);
+    assert_eq!(rx.recv().unwrap(), box 102);
 }