Merge pull request #698 from RalfJung/stacked-borrows-2

test that creating a 2nd mutable ref from a NonNull invalidates the first

Author: RalfJung

.appveyor.yml

@@ -30,6 +30,7 @@ install:
 build_script:
     - set RUST_TEST_NOCAPTURE=1
     - set RUST_BACKTRACE=1
+    - set RUSTFLAGS=-C debug-assertions
     # Build and install miri
     - cargo build --release --all-features --all-targets
     - cargo install --all-features --force --path .

.travis.yml

@@ -12,6 +12,12 @@ os:
 - osx
 dist: xenial
 
+env:
+  global:
+  - RUST_TEST_NOCAPTURE=1
+  - RUST_BACKTRACE=1
+  - RUSTFLAGS="-C debug-assertions"
+
 before_script:
 # Linux: install extra stuff for cross-compilation
 - if [[ "$TRAVIS_OS_NAME" == linux ]]; then sudo apt update && sudo apt install gcc-multilib; fi
@@ -48,7 +54,3 @@ notifications:
 branches:
   only:
   - master
-env:
-  global:
-  - RUST_TEST_NOCAPTURE=1
-  - RUST_BACKTRACE=1

src/bin/cargo-miri.rs

@@ -1,7 +1,5 @@
 #![feature(inner_deref)]
 
-extern crate cargo_metadata;
-
 use std::fs::{self, File};
 use std::io::{self, Write, BufRead};
 use std::path::{PathBuf, Path};

test-cargo-miri/src/main.rs

@@ -1,7 +1,3 @@
-extern crate byteorder;
-#[cfg(test)]
-extern crate rand;
-
 use byteorder::{BigEndian, ByteOrder};
 
 fn main() {

tests/compile-fail/stacked_borrows/mut_exclusive_violation2.rs

@@ -0,0 +1,10 @@
+use std::ptr::NonNull;
+
+fn main() { unsafe {
+    let x = &mut 0;
+    let mut ptr1 = NonNull::from(x);
+    let mut ptr2 = ptr1.clone();
+    let raw1 = ptr1.as_mut();
+    let _raw2 = ptr2.as_mut();
+    let _val = *raw1; //~ ERROR borrow stack
+} }