WIP, waiting for align_offset PR in rust

Author: Oliver Schneider

Cargo.lock

@@ -34,7 +34,6 @@ cargo_miri = ["cargo_metadata"]
 
 [dev-dependencies]
 compiletest_rs = { version = "0.2.10", features = ["tmp"] }
-home = "0.3"
 
 [workspace]
 exclude = ["xargo", "cargo-miri-test", "rustc_tests"]

Cargo.toml

@@ -15,11 +15,12 @@ install:
     - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
     - rustc -V
     - cargo -V
-    - set RUSTFLAGS=-Zalways-encode-mir -Zmir-emit-validate=1
     - rustup component add rust-src
     - cargo install --git https://github.com/japaric/xargo.git
     - cd xargo
+    - set RUSTFLAGS=-Zalways-encode-mir -Zmir-emit-validate=1
     - xargo build
+    - set RUSTFLAGS=
     - cd ..
 
 build: false

appveyor.yml

@@ -634,6 +634,12 @@ impl<'a, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'tcx, super::Evaluator>
                 let bool = self.tcx.types.bool;
                 self.write_primval(dest, PrimVal::from_bool(false), bool)?;
             }
+            "std::sys::imp::c::::AddVectoredExceptionHandler" |
+            "std::sys::imp::c::::SetThreadStackGuarantee" => {
+                let usize = self.tcx.types.usize;
+                // any non zero value works for the stdlib. This is just used for stackoverflows anyway
+                self.write_primval(dest, PrimVal::Bytes(1), usize)?;
+            },
             _ => return err!(NoMirFor(path)),
         }
 

miri/fn_call.rs

@@ -1,7 +1,6 @@
 #![feature(slice_concat_ext)]
 
 extern crate compiletest_rs as compiletest;
-extern crate home;
 
 use std::slice::SliceConcatExt;
 use std::path::{PathBuf, Path};
@@ -50,7 +49,7 @@ fn compile_fail(sysroot: &Path, path: &str, target: &str, host: &str, fullmir: b
             // skip fullmir on nonhost
             return;
         }
-        let sysroot = home::home_dir().unwrap()
+        let sysroot = std::env::home_dir().unwrap()
             .join(".xargo")
             .join("HOST");
         config.target_rustcflags = Some(format!("--sysroot {}", sysroot.to_str().unwrap()));
@@ -107,9 +106,10 @@ fn miri_pass(path: &str, target: &str, host: &str, fullmir: bool, opt: bool) {
             // skip fullmir on nonhost
             return;
         }
-        let sysroot = home::home_dir().unwrap()
+        let sysroot = std::env::home_dir().unwrap()
             .join(".xargo")
             .join("HOST");
+
         flags.push(format!("--sysroot {}", sysroot.to_str().unwrap()));
     }
     if opt {
@@ -180,9 +180,9 @@ fn run_pass_miri(opt: bool) {
     let sysroot = get_sysroot();
     let host = get_host();
 
-    for_all_targets(&sysroot, |target| {
-        miri_pass("tests/run-pass", &target, &host, false, opt);
-    });
+    //for_all_targets(&sysroot, |target| {
+    //    miri_pass("tests/run-pass", &target, &host, false, opt);
+    //});
     miri_pass("tests/run-pass-fullmir", &host, &host, true, opt);
 }