mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #1577 - RalfJung:rlib, r=RalfJung

Browse Source 
fix for rlib/cdylib crates in dependency tree

Fixes https://github.com/rust-lang/miri/issues/1567

Unfortunately, I found no nice way to test for this.
This commit is contained in:
bors 2020-10-07 17:44:57 +00:00
commit 8ed7face91
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cargo-miri/bin.rs
View File

@ -532,8 +532,7 @@ fn is_target_crate() -> bool {
fn is_runnable_crate() -> bool {
let is_bin = get_arg_flag_value("--crate-type").as_deref().unwrap_or("bin") == "bin";
let is_test = has_arg_flag("--test");
let print = get_arg_flag_value("--print").is_some();
(is_bin || is_test) && !print
is_bin || is_test
}
fn out_filename(prefix: &str, suffix: &str) -> PathBuf {
@ -552,8 +551,21 @@ fn out_filename(prefix: &str, suffix: &str) -> PathBuf {
let verbose = std::env::var_os("MIRI_VERBOSE").is_some();
let target_crate = is_target_crate();
let print = get_arg_flag_value("--print").is_some(); // whether this is cargo passing `--print` to get some infos
if target_crate && is_runnable_crate() {
// rlib and cdylib are just skipped, we cannot interpret them and do not need them
// for the rest of the build either.
match get_arg_flag_value("--crate-type").as_deref() {
Some("rlib") | Some("cdylib") => {
if verbose {
eprint!("[cargo-miri rustc] (rlib/cdylib skipped)");
}
return;
}
_ => {},
}
if !print && target_crate && is_runnable_crate() {
// This is the binary or test crate that we want to interpret under Miri.
// But we cannot run it here, as cargo invoked us as a compiler -- our stdin and stdout are not
// like we want them.
@ -577,7 +589,7 @@ fn out_filename(prefix: &str, suffix: &str) -> PathBuf {
let mut emit_link_hack = false;
// Arguments are treated very differently depending on whether this crate is
// for interpretation by Miri, or for use by a build script / proc macro.
if target_crate {
if !print && target_crate {
// Forward arguments, but remove "link" from "--emit" to make this a check-only build.
let emit_flag = "--emit";
for arg in args {
@ -607,7 +619,7 @@ fn out_filename(prefix: &str, suffix: &str) -> PathBuf {
cmd.arg("--sysroot");
cmd.arg(sysroot);
} else {
// For host crates, just forward everything.
// For host crates or when we are printing, just forward everything.
cmd.args(args);
}