Auto merge of #1333 - RalfJung:flag-test, r=RalfJung

bors · bors · commit 4ed3d487a667 · 2020-04-14T08:25:34.000Z
Make sure we find many failures even with other checks disabled
diff --git a/tests/compile-fail/dangling_pointers/dangling_pointer_deref.rs b/tests/compile-fail/dangling_pointers/dangling_pointer_deref.rs
@@ -1,3 +1,6 @@
+// Make sure we find these even with many checks disabled.
+// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
+
 fn main() {
     let p = {
         let b = Box::new(42);
diff --git a/tests/compile-fail/dangling_pointers/dangling_zst_deref.rs b/tests/compile-fail/dangling_pointers/dangling_zst_deref.rs
@@ -1,3 +1,6 @@
+// Make sure we find these even with many checks disabled.
+// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
+
 fn main() {
     let p = {
         let b = Box::new(42);
diff --git a/tests/compile-fail/intrinsics/uninit_uninhabited_type.rs b/tests/compile-fail/intrinsics/uninit_uninhabited_type.rs
@@ -1,4 +1,4 @@
- // error-pattern: the evaluated program aborted execution: attempted to instantiate uninhabited type `!`
+// error-pattern: the evaluated program aborted execution: attempted to instantiate uninhabited type `!`
 #![feature(never_type)]
 
 #[allow(deprecated, invalid_value)]
diff --git a/tests/compile-fail/intrinsics/zero_fn_ptr.rs b/tests/compile-fail/intrinsics/zero_fn_ptr.rs
@@ -0,0 +1,6 @@
+// error-pattern: the evaluated program aborted execution: attempted to zero-initialize type `fn()`, which is invalid
+
+#[allow(deprecated, invalid_value)]
+fn main() {
+    unsafe { std::mem::zeroed::<fn()>() };
+}
diff --git a/tests/compile-fail/invalid_bool.rs b/tests/compile-fail/invalid_bool.rs
@@ -1,5 +1,6 @@
 // Validation makes this fail in the wrong place
-// compile-flags: -Zmiri-disable-validation
+// Make sure we find these even with many checks disabled.
+// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
 
 fn main() {
     let b = unsafe { std::mem::transmute::<u8, bool>(2) };
diff --git a/tests/compile-fail/invalid_char.rs b/tests/compile-fail/invalid_char.rs
@@ -1,5 +1,6 @@
 // Validation makes this fail in the wrong place
-// compile-flags: -Zmiri-disable-validation
+// Make sure we find these even with many checks disabled.
+// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
 
 fn main() {
     assert!(std::char::from_u32(-1_i32 as u32).is_none());
diff --git a/tests/compile-fail/invalid_enum_discriminant.rs b/tests/compile-fail/invalid_enum_discriminant.rs
@@ -1,5 +1,6 @@
 // Validation makes this fail in the wrong place
-// compile-flags: -Zmiri-disable-validation
+// Make sure we find these even with many checks disabled.
+// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
 
 // error-pattern: invalid enum discriminant
 
diff --git a/tests/compile-fail/invalid_int.rs b/tests/compile-fail/invalid_int.rs
@@ -0,0 +1,8 @@
+// Validation makes this fail in the wrong place
+// Make sure we find these even with many checks disabled.
+// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
+
+fn main() {
+    let i = unsafe { std::mem::MaybeUninit::<i32>::uninit().assume_init() };
+    let _x = i + 0; //~ ERROR this operation requires initialized memory
+}
diff --git a/tests/compile-fail/invalid_zero_init.rs b/tests/compile-fail/invalid_zero_init.rs
diff --git a/tests/compile-fail/overwriting_part_of_relocation_makes_the_rest_undefined.rs b/tests/compile-fail/overwriting_part_of_relocation_makes_the_rest_undefined.rs
@@ -1,3 +1,6 @@
+// Make sure we find these even with many checks disabled.
+// compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
+
 fn main() {
     let mut p = &42;
     unsafe {
diff --git a/tests/compile-fail/stacked_borrows/load_invalid_mut.rs b/tests/compile-fail/stacked_borrows/load_invalid_mut.rs
@@ -1,3 +1,6 @@
+// Make sure we catch this even without validation
+// compile-flags: -Zmiri-disable-validation
+
 // Make sure that we cannot load from memory a `&mut` that got already invalidated.
 fn main() {
     let x = &mut 42;
diff --git a/tests/compile-fail/stacked_borrows/load_invalid_shr.rs b/tests/compile-fail/stacked_borrows/load_invalid_shr.rs
@@ -1,3 +1,6 @@
+// Make sure we catch this even without validation
+// compile-flags: -Zmiri-disable-validation
+
 // Make sure that we cannot load from memory a `&` that got already invalidated.
 fn main() {
     let x = &mut 42;
diff --git a/tests/compile-fail/unaligned_pointers/unaligned_ptr1.rs b/tests/compile-fail/unaligned_pointers/unaligned_ptr1.rs
@@ -1,5 +1,5 @@
-// This should fail even without validation
-// compile-flags: -Zmiri-disable-validation
+// This should fail even without validation or Stacked Borrows.
+// compile-flags: -Zmiri-disable-validation -Zmiri-disable-stacked-borrows
 
 fn main() {
     let x = [2u16, 3, 4]; // Make it big enough so we don't get an out-of-bounds error.
diff --git a/tests/compile-fail/unaligned_pointers/unaligned_ptr2.rs b/tests/compile-fail/unaligned_pointers/unaligned_ptr2.rs
@@ -1,5 +1,5 @@
-// This should fail even without validation.
-// compile-flags: -Zmiri-disable-validation
+// This should fail even without validation or Stacked Borrows.
+// compile-flags: -Zmiri-disable-validation -Zmiri-disable-stacked-borrows
 
 fn main() {
     let x = [2u32, 3]; // Make it big enough so we don't get an out-of-bounds error.
diff --git a/tests/compile-fail/unaligned_pointers/unaligned_ptr3.rs b/tests/compile-fail/unaligned_pointers/unaligned_ptr3.rs
@@ -1,5 +1,5 @@
-// This should fail even without validation.
-// compile-flags: -Zmiri-disable-validation
+// This should fail even without validation or Stacked Borrows.
+// compile-flags: -Zmiri-disable-validation -Zmiri-disable-stacked-borrows
 
 fn main() {
     let x = [2u16, 3, 4, 5]; // Make it big enough so we don't get an out-of-bounds error.
diff --git a/tests/compile-fail/validity/dangling_ref1.rs b/tests/compile-fail/validity/dangling_ref1.rs
@@ -1,3 +1,5 @@
+// Make sure we catch this even without Stacked Borrows
+// compile-flags: -Zmiri-disable-stacked-borrows
 use std::mem;
 
 fn main() {
diff --git a/tests/compile-fail/validity/dangling_ref2.rs b/tests/compile-fail/validity/dangling_ref2.rs
@@ -1,3 +1,5 @@
+// Make sure we catch this even without Stacked Borrows
+// compile-flags: -Zmiri-disable-stacked-borrows
 use std::mem;
 
 fn main() {
diff --git a/tests/compile-fail/validity/dangling_ref3.rs b/tests/compile-fail/validity/dangling_ref3.rs
@@ -1,3 +1,5 @@
+// Make sure we catch this even without Stacked Borrows
+// compile-flags: -Zmiri-disable-stacked-borrows
 use std::mem;
 
 fn dangling() -> *const u8 {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		- // error-pattern: the evaluated program aborted execution: attempted to instantiate uninhabited type `!`
	`1`	+// error-pattern: the evaluated program aborted execution: attempted to instantiate uninhabited type `!`
`2`	`2`	`#![feature(never_type)]`
`3`	`3`
`4`	`4`	`#[allow(deprecated, invalid_value)]`