Skip to content

Commit

Permalink
Auto merge of rust-lang#80758 - RalfJung:miri, r=RalfJung
Browse files Browse the repository at this point in the history 
update Miri

update Miri to include fix for rust-lang/miri#1643
Cc `@rust-lang/miri` r? `@ghost`
  • Loading branch information
@bors
bors committed Jan 6, 2021
2 parents 8fec6c7 + 037c82c commit c2de47a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/miri
Submodule miri updated 58 files
+60 −55 Cargo.lock
+2 −2 README.md
+40 −32 cargo-miri/Cargo.lock
+1 −1 rust-version
+106 −25 src/data_race.rs
+13 −1 src/machine.rs
+0 −5 src/shims/intrinsics.rs
+14 −14 test-cargo-miri/Cargo.lock
+15 −10 test-cargo-miri/run-test.py
+0 −0 test-cargo-miri/run.args.stderr.ref
+0 −0 test-cargo-miri/run.args.stdout.ref
+0 −0 test-cargo-miri/run.default.stderr.ref
+0 −0 test-cargo-miri/run.default.stdout.ref
+0 −0 test-cargo-miri/run.subcrate.stderr.ref
+0 −0 test-cargo-miri/run.subcrate.stdout.ref
+0 −0 test-cargo-miri/test.bin-target.stdout.ref
+0 −0 test-cargo-miri/test.default.stdout.ref
+0 −0 test-cargo-miri/test.filter.stdout.ref
+0 −0 test-cargo-miri/test.stderr-empty.ref
+0 −0 test-cargo-miri/test.stderr-rustdoc.ref
+0 −0 test-cargo-miri/test.subcrate.stdout.ref
+0 −0 test-cargo-miri/test.test-target.stdout.ref
+18 −0 tests/compile-fail/box-cell-alias.rs
+48 −0 tests/compile-fail/data_race/alloc_read_race.rs
+50 −0 tests/compile-fail/data_race/alloc_write_race.rs
+1 −1 tests/compile-fail/data_race/atomic_read_na_write_race1.rs
+1 −1 tests/compile-fail/data_race/atomic_read_na_write_race2.rs
+1 −1 tests/compile-fail/data_race/atomic_write_na_read_race1.rs
+1 −1 tests/compile-fail/data_race/atomic_write_na_read_race2.rs
+1 −1 tests/compile-fail/data_race/atomic_write_na_write_race1.rs
+1 −1 tests/compile-fail/data_race/atomic_write_na_write_race2.rs
+3 −3 tests/compile-fail/data_race/dangling_thread_async_race.rs
+3 −3 tests/compile-fail/data_race/dangling_thread_race.rs
+32 −0 tests/compile-fail/data_race/dealloc_read_race1.rs
+34 −0 tests/compile-fail/data_race/dealloc_read_race2.rs
+52 −0 tests/compile-fail/data_race/dealloc_read_race_stack.rs
+52 −0 tests/compile-fail/data_race/dealloc_read_race_stack_drop.rs
+31 −0 tests/compile-fail/data_race/dealloc_write_race1.rs
+33 −0 tests/compile-fail/data_race/dealloc_write_race2.rs
+52 −0 tests/compile-fail/data_race/dealloc_write_race_stack.rs
+53 −0 tests/compile-fail/data_race/dealloc_write_race_stack_drop.rs
+1 −1 tests/compile-fail/data_race/enable_after_join_to_main.rs
+1 −1 tests/compile-fail/data_race/read_write_race.rs
+57 −0 tests/compile-fail/data_race/read_write_race_stack.rs
+1 −1 tests/compile-fail/data_race/relax_acquire_race.rs
+3 −3 tests/compile-fail/data_race/release_seq_race.rs
+1 −1 tests/compile-fail/data_race/release_seq_race_same_thread.rs
+1 −1 tests/compile-fail/data_race/rmw_race.rs
+1 −1 tests/compile-fail/data_race/write_write_race.rs
+57 −0 tests/compile-fail/data_race/write_write_race_stack.rs
+19 −0 tests/run-pass/concurrency/concurrent_caller_location.rs
+2 −0 tests/run-pass/concurrency/concurrent_caller_location.stderr
+16 −0 tests/run-pass/concurrency/issue1643.rs
+2 −0 tests/run-pass/concurrency/issue1643.stderr
+1 −1 tests/run-pass/dyn-lcsit.rs
+6 −2 tests/run-pass/intrinsics.rs
+4 −0 tests/run-pass/leak-in-static.rs
+7 −1 tests/run-pass/rc.rs

0 comments on commit c2de47a

Please sign in to comment.