From bac89ae1d875ff3cf28c682c4d34d30058bfa6c4 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 13 Sep 2017 12:41:38 +0200
Subject: [PATCH] enable validation for a bunch of more tests

---
 src/librustc_mir/interpret/validation.rs | 3 +--
 tests/compile-fail/panic.rs              | 2 --
 tests/compile-fail/zst2.rs               | 2 --
 tests/compile-fail/zst3.rs               | 2 --
 tests/run-pass-fullmir/hashmap.rs        | 2 --
 tests/run-pass/btreemap.rs               | 2 +-
 6 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/librustc_mir/interpret/validation.rs b/src/librustc_mir/interpret/validation.rs
index b379fa735c9d..2e9865530d4e 100644
--- a/src/librustc_mir/interpret/validation.rs
+++ b/src/librustc_mir/interpret/validation.rs
@@ -126,8 +126,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> {
             use regex::Regex;
             lazy_static! {
                 static ref RE: Regex = Regex::new("^(\
-                    (std|alloc::heap::__core)::mem::uninitialized::|\
-                    (std|alloc::heap::__core)::mem::forget::|\
+                    (std|alloc::heap::__core)::mem::(uninitialized|forget)::|\
                     <(std|alloc)::heap::Heap as (std::heap|alloc::allocator)::Alloc>::|\
                     <(std|alloc::heap::__core)::mem::ManuallyDrop<T>><.*>::new$|\
                     <(std|alloc::heap::__core)::mem::ManuallyDrop<T> as std::ops::DerefMut><.*>::deref_mut$|\
diff --git a/tests/compile-fail/panic.rs b/tests/compile-fail/panic.rs
index 4247cdaa4635..0d594f9bd4c3 100644
--- a/tests/compile-fail/panic.rs
+++ b/tests/compile-fail/panic.rs
@@ -1,5 +1,3 @@
-// FIXME: Probably failing due to https://github.com/solson/miri/issues/296
-// compile-flags: -Zmir-emit-validate=0
 //error-pattern: the evaluated program panicked
 
 fn main() {
diff --git a/tests/compile-fail/zst2.rs b/tests/compile-fail/zst2.rs
index fa4ae9afdf69..dd826c2fd74e 100644
--- a/tests/compile-fail/zst2.rs
+++ b/tests/compile-fail/zst2.rs
@@ -1,5 +1,3 @@
-// FIXME: Probably failing due to https://github.com/solson/miri/issues/296
-// compile-flags: -Zmir-emit-validate=0
 // error-pattern: the evaluated program panicked
 
 #[derive(Debug)]
diff --git a/tests/compile-fail/zst3.rs b/tests/compile-fail/zst3.rs
index 320541552fb5..53c42995b8a1 100644
--- a/tests/compile-fail/zst3.rs
+++ b/tests/compile-fail/zst3.rs
@@ -1,5 +1,3 @@
-// FIXME: Probably failing due to https://github.com/solson/miri/issues/296
-// compile-flags: -Zmir-emit-validate=0
 // error-pattern: the evaluated program panicked
 
 #[derive(Debug)]
diff --git a/tests/run-pass-fullmir/hashmap.rs b/tests/run-pass-fullmir/hashmap.rs
index 892518011dbc..f4a358174f55 100644
--- a/tests/run-pass-fullmir/hashmap.rs
+++ b/tests/run-pass-fullmir/hashmap.rs
@@ -1,5 +1,3 @@
-// FIXME: disable validation until we figure out how to handle <https://github.com/solson/miri/issues/296>.
-// compile-flags: -Zmir-emit-validate=0
 use std::collections::{self, HashMap};
 use std::hash::BuildHasherDefault;
 
diff --git a/tests/run-pass/btreemap.rs b/tests/run-pass/btreemap.rs
index 55e6b07a6585..0fd28d6f1e8d 100644
--- a/tests/run-pass/btreemap.rs
+++ b/tests/run-pass/btreemap.rs
@@ -1,4 +1,4 @@
-// mir validation can't cope with `mem::uninitialized::<SomeEnum>()`
+// mir validation can't cope with `mem::uninitialized()`, so this test fails with validation & full-MIR.
 // compile-flags: -Zmir-emit-validate=0
 
 #[derive(PartialEq, Eq, PartialOrd, Ord)]