diff options
| author | Ralf Jung <post@ralfj.de> | 2017-09-13 12:41:38 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2017-09-13 15:46:53 +0200 |
| commit | bac89ae1d875ff3cf28c682c4d34d30058bfa6c4 (patch) | |
| tree | c7d7cc5543d262a86e7a6b6df1cb1ef1d9b93f5c | |
| parent | aa578de018ef29d6caac4bd4b71f5d3ffd61608b (diff) | |
| download | rust-bac89ae1d875ff3cf28c682c4d34d30058bfa6c4.tar.gz rust-bac89ae1d875ff3cf28c682c4d34d30058bfa6c4.zip | |
enable validation for a bunch of more tests
| -rw-r--r-- | src/librustc_mir/interpret/validation.rs | 3 | ||||
| -rw-r--r-- | tests/compile-fail/panic.rs | 2 | ||||
| -rw-r--r-- | tests/compile-fail/zst2.rs | 2 | ||||
| -rw-r--r-- | tests/compile-fail/zst3.rs | 2 | ||||
| -rw-r--r-- | tests/run-pass-fullmir/hashmap.rs | 2 | ||||
| -rw-r--r-- | 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 b379fa735c9..2e9865530d4 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 4247cdaa463..0d594f9bd4c 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 fa4ae9afdf6..dd826c2fd74 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 320541552fb..53c42995b8a 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 892518011db..f4a358174f5 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 55e6b07a658..0fd28d6f1e8 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)] |