Merge branch 'master' into patch-1

Author: RalfJung

.appveyor.yml

@@ -3,28 +3,31 @@ environment:
         PROJECT_NAME: miri
     matrix:
         - TARGET: x86_64-pc-windows-msvc
-          MSYS2_BITS: 64
         - TARGET: i686-pc-windows-msvc
-          MSYS2_BITS: 32
 
 # branches to build
 branches:
   # whitelist
   only:
     - master
 
+cache:
+    - '%USERPROFILE%\.cargo'
+    - '%USERPROFILE%\.rustup'
+
 install:
-    # Install Rust.
-    - set PATH=C:\Program Files\Git\mingw64\bin;C:\msys64\mingw%MSYS2_BITS%\bin;%PATH%
-    - set /p RUST_TOOLCHAIN=<rust-version
+    # Install Rust
     - curl -sSf -o rustup-init.exe https://win.rustup.rs/
-    - rustup-init.exe -y --default-host %TARGET% --default-toolchain %RUST_TOOLCHAIN%
+    - rustup-init.exe -y --default-host %TARGET% --default-toolchain stable
     - set PATH=%USERPROFILE%\.cargo\bin;%PATH%
+    # Install "master" toolchain
+    - cargo install rustup-toolchain-install-master
+    - set /p RUSTC_HASH=<rust-version
+    - rustup-toolchain-install-master -f -n master %RUSTC_HASH% -c cargo -c rust-src
+    - rustup default master
     - rustc --version
 
-build: false
-
-test_script:
+build_script:
     - set RUST_TEST_NOCAPTURE=1
     - set RUST_BACKTRACE=1
     # Build and install miri
@@ -33,11 +36,18 @@ test_script:
     # Get ourselves a MIR-full libstd, and use it henceforth
     - cargo miri setup
     - set MIRI_SYSROOT=%USERPROFILE%\AppData\Local\miri\miri\cache\HOST
+
+test_script:
     # Test miri
     - cargo test --release --all-features
     # Test cargo integration
     - cd test-cargo-miri
-    - python3 run-test.py
+    - '"C:\msys64\mingw64\bin\python3.exe" run-test.py'
+
+after_test:
+    # Don't cache "master" toolchain, it's a waste
+    - rustup default stable
+    - rustup toolchain uninstall master
 
 notifications:
     - provider: Email

.travis.yml

@@ -4,7 +4,8 @@ cache:
   # we cannot reuse anyway when the nightly changes (and it grows quite large
   # over time).
   directories:
-    - /home/travis/.cargo
+    - $HOME/.cargo
+    - $HOME/.rustup
 
 os:
 - linux
@@ -17,18 +18,27 @@ before_script:
 # Compute the rust version we use. We do not use "language: rust" to have more control here.
 - |
   if [[ "$TRAVIS_EVENT_TYPE" == cron ]]; then
-    RUST_TOOLCHAIN=nightly
+    RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}')
   else
-    RUST_TOOLCHAIN=$(cat rust-version)
+    RUSTC_HASH=$(cat rust-version)
   fi
-# install Rust
-- curl https://build.travis-ci.org/files/rustup-init.sh -sSf | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN"
+# Install Rust ("stable" toolchain for better caching, it is just used to build rustup-toolchain-install-master)
+- curl https://build.travis-ci.org/files/rustup-init.sh -sSf | sh -s -- -y --default-toolchain stable
 - export PATH=$HOME/.cargo/bin:$PATH
+# Install "master" toolchain
+- cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
+- travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c cargo -c rust-src
+- rustup default master
 - rustc --version
 
 script:
 - ./travis.sh
 
+before_cache:
+# Don't cache "master" toolchain, it's a waste
+- rustup default stable
+- rustup toolchain uninstall master
+
 notifications:
   email:
     on_success: never

README.md

@@ -122,13 +122,18 @@ other projects:
 
 ```sh
 rustup component remove miri # avoid having Miri installed twice
-cargo +nightly install --path "$DIR" --force # or the nightly in `rust-version`
+cargo +nightly install --path "$DIR" --force
 cargo +nightly miri setup
 ```
 
 (We are giving `+nightly` explicitly here all the time because it is important
 that all of these commands get executed with the same toolchain.)
 
+In case this fails, your nightly might be incompatible with Miri master.  The
+`rust-version` file contains the commit hash of rustc that Miri is currently
+tested against; you can use that to find a nightly that works or you might have
+to wait for the next nightly to get released.
+
 If you want to use a different libstd (not the one that comes with the
 nightly), you can do that by running
 

rust-version

@@ -1 +1 @@
-nightly-2019-03-29
+f717b58dd70829f105960a071c7992b440720482

src/fn_call.rs

@@ -270,7 +270,7 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a + 'mir>: crate::MiriEvalContextExt<'
                 let mut args = this.frame().mir.args_iter();
 
                 let arg_local = args.next().ok_or_else(||
-                    EvalErrorKind::AbiViolation(
+                    InterpError::AbiViolation(
                         "Argument to __rust_maybe_catch_panic does not take enough arguments."
                             .to_owned(),
                     ),
@@ -529,7 +529,7 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a + 'mir>: crate::MiriEvalContextExt<'
                 // This is `libc::pthread_key_t`.
                 let key_type = args[0].layout.ty
                     .builtin_deref(true)
-                    .ok_or_else(|| EvalErrorKind::AbiViolation("wrong signature used for `pthread_key_create`: first argument must be a raw pointer.".to_owned()))?
+                    .ok_or_else(|| InterpError::AbiViolation("wrong signature used for `pthread_key_create`: first argument must be a raw pointer.".to_owned()))?
                     .ty;
                 let key_layout = this.layout_of(key_type)?;
 

src/helpers.rs

@@ -39,7 +39,7 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a + 'mir>: crate::MiriEvalContextExt<'
             })
             .ok_or_else(|| {
                 let path = path.iter().map(|&s| s.to_owned()).collect();
-                EvalErrorKind::PathNotFound(path).into()
+                InterpError::PathNotFound(path).into()
             })
     }
 

src/operator.rs

@@ -325,7 +325,7 @@ impl<'a, 'mir, 'tcx> EvalContextExt<'tcx> for super::MiriEvalContext<'a, 'mir, '
         let pointee_size = self.layout_of(pointee_ty)?.size.bytes() as i64;
         let offset = offset
             .checked_mul(pointee_size)
-            .ok_or_else(|| EvalErrorKind::Overflow(mir::BinOp::Mul))?;
+            .ok_or_else(|| InterpError::Overflow(mir::BinOp::Mul))?;
         // Now let's see what kind of pointer this is.
         if let Scalar::Ptr(ptr) = ptr {
             // Both old and new pointer must be in-bounds of a *live* allocation.

src/stacked_borrows.rs

@@ -7,7 +7,7 @@ use rustc::hir::{Mutability, MutMutable, MutImmutable};
 use rustc::mir::RetagKind;
 
 use crate::{
-    EvalResult, EvalErrorKind, MiriEvalContext, HelpersEvalContextExt, Evaluator, MutValueVisitor,
+    EvalResult, InterpError, MiriEvalContext, HelpersEvalContextExt, Evaluator, MutValueVisitor,
     MemoryKind, MiriMemoryKind, RangeMap, AllocId, Allocation, AllocationExtra,
     Pointer, Immediate, ImmTy, PlaceTy, MPlaceTy,
 };
@@ -380,7 +380,7 @@ impl<'tcx> Stacks {
             ptr.tag, kind, ptr, size.bytes());
         let stacks = self.stacks.borrow();
         for stack in stacks.iter(ptr.offset, size) {
-            stack.deref(ptr.tag, kind).map_err(EvalErrorKind::MachineError)?;
+            stack.deref(ptr.tag, kind).map_err(InterpError::MachineError)?;
         }
         Ok(())
     }
@@ -435,7 +435,7 @@ impl<'tcx> Stacks {
         let mut stacks = self.stacks.borrow_mut();
         for stack in stacks.iter_mut(ptr.offset, size) {
             // Access source `ptr`, create new ref.
-            let ptr_idx = stack.deref(ptr.tag, new_kind).map_err(EvalErrorKind::MachineError)?;
+            let ptr_idx = stack.deref(ptr.tag, new_kind).map_err(InterpError::MachineError)?;
             // If we can deref the new tag already, and if that tag lives higher on
             // the stack than the one we come from, just use that.
             // That is, we check if `new_bor` *already* is "derived from" `ptr.tag`.

src/tls.rs

@@ -4,7 +4,7 @@ use rustc_target::abi::LayoutOf;
 use rustc::{ty, ty::layout::HasDataLayout, mir};
 
 use crate::{
-    EvalResult, EvalErrorKind, StackPopCleanup,
+    EvalResult, InterpError, StackPopCleanup,
     MPlaceTy, Scalar, Borrow,
 };
 
@@ -149,7 +149,7 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a+'mir>: crate::MiriEvalContextExt<'a,
                 StackPopCleanup::None { cleanup: true },
             )?;
             let arg_local = this.frame().mir.args_iter().next().ok_or_else(
-                || EvalErrorKind::AbiViolation("TLS dtor does not take enough arguments.".to_owned()),
+                || InterpError::AbiViolation("TLS dtor does not take enough arguments.".to_owned()),
             )?;
             let dest = this.eval_place(&mir::Place::Base(mir::PlaceBase::Local(arg_local)))?;
             this.write_scalar(ptr, dest)?;