Skip to content

Commit

Permalink
Rollup merge of #79568 - RalfJung:miri, r=RalfJung
Browse files Browse the repository at this point in the history
update Miri

This update includes rust-lang/miri#1617, the data race detector by ``@JCTyblaidd.`` :)

Cc ``@rust-lang/miri`` r? ``@ghost``
  • Loading branch information
m-ou-se committed Dec 1, 2020
2 parents 33d7b8c + 4eb64c8 commit 1bc1a18
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2131,6 +2131,7 @@ dependencies = [
"rustc-workspace-hack",
"rustc_version",
"shell-escape",
"smallvec 1.4.2",
]

[[package]]
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Submodule miri updated 44 files
+7 −0 Cargo.lock
+1 −9 Cargo.toml
+5 −6 README.md
+3 −0 bench-cargo-miri/mse/src/main.rs
+1 −1 rust-version
+0 −260 src/bin/miri-rustc-tests.rs
+3 −0 src/bin/miri.rs
+1,381 −0 src/data_race.rs
+3 −0 src/eval.rs
+9 −0 src/lib.rs
+25 −1 src/machine.rs
+247 −151 src/shims/intrinsics.rs
+12 −1 src/shims/posix/linux/sync.rs
+32 −8 src/shims/posix/sync.rs
+15 −6 src/shims/posix/thread.rs
+104 −9 src/sync.rs
+42 −7 src/thread.rs
+660 −0 src/vector_clock.rs
+31 −0 tests/compile-fail/data_race/atomic_read_na_write_race1.rs
+31 −0 tests/compile-fail/data_race/atomic_read_na_write_race2.rs
+31 −0 tests/compile-fail/data_race/atomic_write_na_read_race1.rs
+31 −0 tests/compile-fail/data_race/atomic_write_na_read_race2.rs
+31 −0 tests/compile-fail/data_race/atomic_write_na_write_race1.rs
+31 −0 tests/compile-fail/data_race/atomic_write_na_write_race2.rs
+44 −0 tests/compile-fail/data_race/dangling_thread_async_race.rs
+41 −0 tests/compile-fail/data_race/dangling_thread_race.rs
+38 −0 tests/compile-fail/data_race/enable_after_join_to_main.rs
+27 −0 tests/compile-fail/data_race/read_write_race.rs
+50 −0 tests/compile-fail/data_race/relax_acquire_race.rs
+55 −0 tests/compile-fail/data_race/release_seq_race.rs
+51 −0 tests/compile-fail/data_race/rmw_race.rs
+27 −0 tests/compile-fail/data_race/write_write_race.rs
+122 −0 tests/run-pass/concurrency/data_race.rs
+2 −0 tests/run-pass/concurrency/data_race.stderr
+28 −0 tests/run-pass/concurrency/disable_data_race_detector.rs
+2 −0 tests/run-pass/concurrency/disable_data_race_detector.stderr
+1 −1 tests/run-pass/concurrency/linux-futex.stderr
+1 −1 tests/run-pass/concurrency/simple.stderr
+1 −1 tests/run-pass/concurrency/sync.stderr
+1 −1 tests/run-pass/concurrency/thread_locals.stderr
+1 −1 tests/run-pass/concurrency/tls_lib_drop.stderr
+1 −1 tests/run-pass/libc.stderr
+1 −1 tests/run-pass/panic/concurrent-panic.stderr
+8 −0 tests/run-pass/vec.rs

0 comments on commit 1bc1a18

Please sign in to comment.