Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update miri #69636

Merged
merged 2 commits into from
Mar 4, 2020
Merged

update miri #69636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a6f45e
point cargo-miri to the right xargo binary
RalfJung Mar 2, 2020
faf3a5e
update miri
RalfJung Mar 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2156,6 +2156,7 @@ dependencies = [
"rustc-workspace-hack",
"rustc_version",
"serde",
"serde_json",
"shell-escape",
"vergen",
]
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ impl Step for Miri {
// Overwrite bootstrap's `rustc` wrapper overwriting our flags.
cargo.env("RUSTC_DEBUG_ASSERTIONS", "true");
// Let cargo-miri know where xargo ended up.
cargo.env("XARGO", builder.out.join("bin").join("xargo"));
cargo.env("XARGO_CHECK", builder.out.join("bin").join("xargo-check"));

let mut cargo = Command::from(cargo);
if !try_run(builder, &mut cargo) {
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Open in desktop
Submodule miri updated 47 files
+1 −0 Cargo.lock
+3 −1 Cargo.toml
+11 −6 README.md
+1 −1 bench-cargo-miri/mse/src/main.rs
+1 −0 benches/helpers/miri_helper.rs
+1 −1 rust-version
+116 −73 src/bin/cargo-miri.rs
+7 −3 src/bin/miri-rustc-tests.rs
+6 −1 src/bin/miri.rs
+14 −11 src/eval.rs
+18 −19 src/helpers.rs
+10 −8 src/intptrcast.rs
+14 −8 src/lib.rs
+94 −64 src/machine.rs
+4 −4 src/mono_hash_map.rs
+3 −3 src/operator.rs
+6 −6 src/shims/env.rs
+1 −1 src/shims/foreign_items.rs
+18 −3 src/shims/foreign_items/posix.rs
+14 −0 src/shims/foreign_items/posix/linux.rs
+14 −0 src/shims/foreign_items/posix/macos.rs
+2 −1 src/shims/foreign_items/windows.rs
+341 −1 src/shims/fs.rs
+4 −2 src/shims/panic.rs
+22 −15 src/stacked_borrows.rs
+1 −1 tests/compile-fail/deallocate-bad-alignment.rs
+1 −1 tests/compile-fail/deallocate-bad-size.rs
+1 −1 tests/compile-fail/deallocate-twice.rs
+2 −2 tests/compile-fail/modifying_constants.rs
+1 −1 tests/compile-fail/reallocate-bad-size.rs
+1 −1 tests/compile-fail/reallocate-change-alloc.rs
+1 −1 tests/compile-fail/reallocate-dangling.rs
+2 −2 tests/compile-fail/reference_to_packed.rs
+2 −2 tests/compile-fail/stack_free.rs
+2 −2 tests/compile-fail/static_memory_modification1.rs
+2 −2 tests/compile-fail/static_memory_modification2.rs
+2 −2 tests/compile-fail/static_memory_modification3.rs
+1 −1 tests/compile-fail/validity/cast_fn_ptr1.rs
+1 −1 tests/compile-fail/validity/cast_fn_ptr2.rs
+1 −1 tests/compile-fail/validity/fn_ptr_offset.rs
+1 −1 tests/compile-fail/validity/invalid_bool.rs
+1 −1 tests/compile-fail/validity/invalid_char.rs
+40 −1 tests/run-pass/fs.rs
+11 −2 tests/run-pass/generator.rs
+7 −7 tests/run-pass/heap_allocator.rs
+2 −2 tests/run-pass/observed_local_mut.rs
+2 −2 tests/run-pass/transmute_fat.rs