Auto merge of rust-lang#98518 - RalfJung:miri, r=RalfJung

update Miri Fixes rust-lang#98493 (this is a flaky test, that's why the toolstate already says Miri is fixed) r? `@ghost` Cc `@rust-lang/miri`
matthiaskrgr · Jun 26, 2022 · 7125846 · 7125846
2 parents 0e1a6fb + 61a986a
commit 7125846
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -2330,20 +2330,6 @@ dependencies = [
  "topological-sort",
 ]
 
-[[package]]
-name = "measureme"
-version = "9.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f7a41bc6f856a2cf0e95094ad5121f82500e2d9a0f3c0171d98f6566d8117d"
-dependencies = [
- "log",
- "memmap2",
- "parking_lot 0.11.2",
- "perf-event-open-sys",
- "rustc-hash",
- "smallvec",
-]
-
 [[package]]
 name = "measureme"
 version = "10.0.0"
@@ -2442,7 +2428,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "measureme 9.1.2",
+ "measureme",
  "rand 0.8.5",
  "regex",
  "rustc-workspace-hack",
@@ -3652,7 +3638,7 @@ dependencies = [
  "cstr",
  "libc",
  "libloading",
- "measureme 10.0.0",
+ "measureme",
  "rustc-demangle",
  "rustc_ast",
  "rustc_attr",
@@ -3750,7 +3736,7 @@ dependencies = [
  "indexmap",
  "jobserver",
  "libc",
- "measureme 10.0.0",
+ "measureme",
  "memmap2",
  "parking_lot 0.11.2",
  "rustc-hash",
@@ -4306,7 +4292,7 @@ dependencies = [
 name = "rustc_query_impl"
 version = "0.0.0"
 dependencies = [
- "measureme 10.0.0",
+ "measureme",
  "rustc-rayon-core",
  "rustc_ast",
  "rustc_data_structures",

diff --git a/src/tools/miri b/src/tools/miri
+11 −26		.github/workflows/ci.yml
+2 −2		Cargo.lock
+1 −1		Cargo.toml
+2 −4		README.md
+4 −2		cargo-miri/bin.rs
+8 −1		miri
+1 −1		rust-version
+1 −1		rustup-toolchain
+4 −4		src/diagnostics.rs
+9 −9		src/intptrcast.rs
+6 −4		src/lib.rs
+21 −23		src/machine.rs
+0 −1		src/shims/unix/linux/sync.rs
+284 −101		src/stacked_borrows.rs
+17 −13		src/stacked_borrows/diagnostics.rs
+1 −1		tests/fail/abort-terminator.rs
+1 −0		tests/fail/abort-terminator.stderr
+1 −2		tests/fail/concurrency/too_few_args.rs
+1 −2		tests/fail/concurrency/too_many_args.rs
+1 −1		tests/fail/concurrency/unwind_top_of_stack.rs
+1 −0		tests/fail/concurrency/unwind_top_of_stack.stderr
+1 −2		tests/fail/intrinsics/overflowing-unchecked-rsh.rs
+1 −1		tests/fail/intrinsics/uninit_uninhabited_type.rs
+1 −2		tests/fail/intrinsics/zero_fn_ptr.rs
+1 −1		tests/fail/panic/bad_unwind.rs
+1 −1		tests/fail/provenance/permissive_provenance_transmute.rs
+1 −1		tests/fail/provenance/ptr_int_unexposed.rs
+16 −0		tests/fail/stacked_borrows/deallocate_against_barrier2.rs
+38 −0		tests/fail/stacked_borrows/deallocate_against_barrier2.stderr
+12 −0		tests/fail/stacked_borrows/exposed_only_ro.rs
+18 −0		tests/fail/stacked_borrows/exposed_only_ro.stderr
+17 −0		tests/fail/stacked_borrows/illegal_read_despite_exposed1.rs
+18 −0		tests/fail/stacked_borrows/illegal_read_despite_exposed1.stderr
+20 −0		tests/fail/stacked_borrows/illegal_read_despite_exposed2.rs
+18 −0		tests/fail/stacked_borrows/illegal_read_despite_exposed2.stderr
+16 −0		tests/fail/stacked_borrows/illegal_write_despite_exposed1.rs
+18 −0		tests/fail/stacked_borrows/illegal_write_despite_exposed1.stderr
+1 −2		tests/fail/sync/libc_pthread_rwlock_read_write_deadlock_single_thread.rs
+1 −2		tests/fail/sync/libc_pthread_rwlock_write_read_deadlock_single_thread.rs
+1 −2		tests/fail/sync/libc_pthread_rwlock_write_write_deadlock_single_thread.rs
+9 −6		tests/fail/transmute_fat1.rs
+2 −2		tests/fail/transmute_fat1.stderr
+6 −6		tests/fail/unaligned_pointers/alignment.rs
+2 −2		tests/fail/unaligned_pointers/alignment.stderr
+9 −0		tests/pass/concurrency/mutex_leak.rs
+3 −48		tests/pass/concurrency/sync.rs
+48 −1		tests/pass/concurrency/sync_nopreempt.rs
+1 −1		tests/pass/ptr_int_from_exposed.rs
+73 −3		tests/pass/stacked-borrows/int-to-ptr.rs
+1 −18		ui_test/src/lib.rs
+1 −1		ui_test/src/rustc_stderr.rs