make Miri work in rustc bootstrap stage 0 #1405
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Ah... this breaks outside of the rustbuild environment because "miri-as-rustc" uses the wrong sysroot dir... namely something relative to where the binary lives. |
RalfJung
force-pushed
the
stage-0
branch
2 times, most recently
from
03abe59 to
49a3a86
Compare
|
This now works locally, and should also still work during bootstrap. r? @oli-obk |
RalfJung
commented
May 9, 2020
Also while at it, refactor how we pass the default Miri flags
oli-obk
reviewed
May 9, 2020
| @@ -123,7 +122,47 @@ fn compile_time_sysroot() -> Option<String> { | |||
| }) | |||
| } | |||
|
|
|||
| /// Execute a compiler with the given CLI arguments and callbacks. | |||
| fn run_compiler(mut args: Vec<String>, callbacks: &mut (dyn rustc_driver::Callbacks + Send)) { | |||
There was a problem hiding this comment.
Oh that's a nice convenience function. I wonder if we can upstream the non-sysroot part of it
There was a problem hiding this comment.
Yeah I wondered the same actually.
Any proposals for a name, given that rustc_driver::run_compiler is already taken?
oli-obk
approved these changes
May 9, 2020
|
@bors r+ |
|
📌 Commit e65d87b has been approved by |
|
☀️ Test successful - checks-travis, status-appveyor |
bors
added a commit
that referenced
this pull request
May 10, 2020
cargo-miri: never invoke rustc Always go through 'MIRI_BE_RUSTC=1 miri' instead. This is based on @oli-obk's great idea to add a way to make Miri behave like rustc, which already helped us in #1405. Now it means in `cargo-miri` we run *all* crates through the same binary, and use the env var to determine if we compile or interpret them. This makes sure the compiler is consistent. The `rustc` binary of the current toolchain is now not used at all, only the `miri` binary is. In particular this means we can kill the sysroot consistency check. :)
bors
added a commit
that referenced
this pull request
May 10, 2020
cargo-miri: never invoke rustc Always go through 'MIRI_BE_RUSTC=1 miri' instead. This is based on @oli-obk's great idea to add a way to make Miri behave like rustc, which already helped us in #1405. Now it means in `cargo-miri` we run *all* crates through the same binary, and use the env var to determine if we compile or interpret them. This makes sure the compiler is consistent. The `rustc` binary of the current toolchain is now not used at all, only the `miri` binary is. In particular this means we can kill the sysroot consistency check. :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes rust-lang/rust#52856