update Miri

[RalfJung]

I had to use a hacked version of josh to create this, so let's be careful with merging this and maybe wait a bit to see if the josh issue becomes more clear. But the history looks good to me, we are not adding duplicates of rustc commits that were previously mirrored to Miri.

Also I want to add some cross-testing of Miri in x.py.

[matthiaskrgr]

@bors p=1 (submodule update)

[bors]

⌛ Testing commit 84e6732 with merge c6a9053f8b1e55775ac26c500a1d1f675a5c4dee...

[bors]

💔 Test failed - checks-actions

[RalfJung]

That is some very strange log

     Running `build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\cargo-miri.exe miri test --manifest-path D:\a\rust\rust\src/tools/miri/test-cargo-miri/Cargo.toml --target i686-pc-windows-msvc --tests --`
   Compiling byteorder v1.4.3
   Compiling exported_symbol_dep v0.1.0 (D:\a\rust\rust\src\tools\miri\test-cargo-miri\exported-symbol-dep)
   Compiling issue_rust_86261 v0.1.0 (D:\a\rust\rust\src\tools\miri\test-cargo-miri\issue-rust-86261)
   Compiling cargo-miri-test v0.1.0 (D:\a\rust\rust\src\tools\miri\test-cargo-miri)
   Compiling issue_1691 v0.1.0 (D:\a\rust\rust\src\tools\miri\test-cargo-miri\issue-1691)
   Compiling byteorder v0.5.3
   Compiling exported_symbol v0.1.0 (D:\a\rust\rust\src\tools\miri\test-cargo-miri\exported-symbol)
   Compiling issue_1567 v0.1.0 (D:\a\rust\rust\src\tools\miri\test-cargo-miri\issue-1567)
   Compiling cdylib v0.1.0 (D:\a\rust\rust\src\tools\miri\test-cargo-miri\cdylib)
   Compiling issue_1705 v0.1.0 (D:\a\rust\rust\src\tools\miri\test-cargo-miri\issue-1705)
    Finished test [unoptimized + debuginfo] target(s) in 1.30s
     Running unittests src\main.rs (build\x86_64-pc-windows-msvc\stage2-tools\miri\i686-pc-windows-msvc\debug\deps\cargo_miri_test-0f976196cd517b80.exe)

running 2 tests
test test::dev_dependency ... ok
test test::exported_symbol ... ok

test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out

     Running tests\main.rs (build\x86_64-pc-windows-msvc\stage2-tools\miri\i686-pc-windows-msvc\debug\deps\main-991d0e7eee076530.exe)
imported main
     Running tests\test.rs (build\x86_64-pc-windows-msvc\stage2-tools\miri\i686-pc-windows-msvc\debug\deps\test-5a629d2bcf30ccfb.exe)

running 6 tests
test cargo_env ... ok
test deps ... ok
test do_panic - should panic ... ok
test does_not_work_on_miri ... ignored
test fail_index_check - should panic ... ok
test simple ... ok

test result: ok. 5 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out

[TIMING] test::Miri { stage: 2, host: x86_64-pc-windows-msvc, target: i686-pc-windows-msvc } -- 101.188
Build completed successfully in 0:01:46
Building rustbuild
    Finished dev [unoptimized] target(s) in 0.12s
warning: the following packages contain code that will be rejected by a future version of Rust: ntapi v0.3.7
note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 8`
thread 'main' panicked at '

couldn't find required command: "cc"

', sanity.rs:59:13
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
Build completed unsuccessfully in 0:00:00

Which part of the build is trying to run cc here? This should just be doing cargo miri test and it works fine on Miri's CI...

The panic seems to come from bootstrap

rust/src/bootstrap/sanity.rs

Line 59 in fdb3955

panic!("\n\ncouldn't find required command: {:?}\n\n", cmd.as_ref());

but I don't know why that code even runs.
Cc @jyn514

[RalfJung]

Oh, this is probably not from the cargo miri test, but from the next thing checktools does

python3 "$X_PY" test --stage 2 src/tools/miri --target aarch64-apple-darwin

Looks like some part of x.py decides that it makes no sense to run this command without cc. Sadly that heuristic is wrong, Miri tests work fine on any host and don't need such tools to be installed.

I think for now I will remove the apple part from CI here, that doesn't need to block the other parts of this PR.

[RalfJung]

Opened #103519 to track the macOS testing.

@bors r=oli-obk

[bors]

📌 Commit a157e0e has been approved by oli-obk

It is now in the queue for this repository.

[bors]

⌛ Testing commit a157e0e with merge 85d089b...

[bors]

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 85d089b to master...

[rust-timer]

Finished benchmarking commit (85d089b): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean1	range	count2
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean1	range	count2
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.3%	[-4.3%, -4.3%]	1
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

Footnotes

1. the arithmetic mean of the percent change ↩ ↩²

2. number of relevant changes ↩ ↩²