From e6822d60b3e2cc63ff0ae4603b1021cd0fb4dae8 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Tue, 14 Apr 2020 10:03:10 +0200 Subject: [PATCH] make sure we find some things without validation or stacked borrows, respectively --- tests/compile-fail/stacked_borrows/load_invalid_mut.rs | 3 +++ tests/compile-fail/stacked_borrows/load_invalid_shr.rs | 3 +++ tests/compile-fail/unaligned_pointers/unaligned_ptr1.rs | 4 ++-- tests/compile-fail/unaligned_pointers/unaligned_ptr2.rs | 4 ++-- tests/compile-fail/unaligned_pointers/unaligned_ptr3.rs | 4 ++-- tests/compile-fail/validity/dangling_ref1.rs | 2 ++ tests/compile-fail/validity/dangling_ref2.rs | 2 ++ tests/compile-fail/validity/dangling_ref3.rs | 2 ++ 8 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tests/compile-fail/stacked_borrows/load_invalid_mut.rs b/tests/compile-fail/stacked_borrows/load_invalid_mut.rs index 1704b7fe19b2..c2c4ce6726df 100644 --- 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 index 4757a2c1e589..7d681f649a10 100644 --- 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 index ee1a13004231..0a67cfc5a1b3 100644 --- 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 index 853d890ecf07..b1fb2f4aa976 100644 --- 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 index 43f6b472da05..c5a3398384e4 100644 --- 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 index 034510f3b283..a83c6af21acf 100644 --- 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 index 4ad9b8135db4..7aff1a49785c 100644 --- 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 index 46e17375a828..495a266a85dc 100644 --- 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 {