`miri` no longer builds after rust-lang/rust#60462

[rust-highfive]

Hello, this is your friendly neighborhood mergebot.
After merging PR #60462, I observed that the tool miri no longer builds.
A follow-up PR to the repository https://github.com/rust-lang/miri is needed to fix the fallout.

cc @eddyb, do you think you would have time to do the follow-up work?
If so, that would be great!

cc @petrochenkov, the PR reviewer, and @rust-lang/compiler -- nominating for prioritization.

[RalfJung]

Miri-side fix at rust-lang/miri#723 which is blocked on #60469.

[RalfJung]

Also blocked on #60541.

[nikomatsakis]

triage: P-medium

[RalfJung]

This was fixes a while ago. But now miri broke again and no new issue was opened?

Cc @rust-lang/infra

I was about to post the following here(a few minutes before you commented, RalfJung) when my system crashed, so here it is after a re-run(hence it took only a few seconds instead of 34mins):

   Compiling miri v0.1.0 (/home/user/build/2nonpkgs/rust.stuff/rust/rust/src/tools/miri)
     Running `/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/bootstrap/debug/rustc --edition=2018 --crate-name miri src/tools/miri/src/lib.rs --color always --error-format json --crate-type lib --emit=dep-info,link -C opt-level=2 --cfg 'feature="cargo_metadata"' --cfg 'feature="cargo_miri"' --cfg 'feature="default"' --cfg 'feature="directories"' --cfg 'feature="rustc_version"' -C metadata=1fcdbf5965d738e2 -C extra-filename=-1fcdbf5965d738e2 --out-dir /home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps --target x86_64-unknown-linux-gnu -C incremental=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/incremental -L dependency=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps -L dependency=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/release/deps --extern byteorder=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libbyteorder-71865cc79aa4c3c4.rlib --extern cargo_metadata=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libcargo_metadata-be77b09321489336.rlib --extern directories=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libdirectories-7a23c6d906c1075b.rlib --extern env_logger=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libenv_logger-a50026f26f34e582.rlib --extern hex=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libhex-c562909d426f1198.rlib --extern log=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/liblog-8ef340c0ab523d07.rlib --extern rand=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/librand-c5e057ba9777126f.rlib --extern rustc_workspace_hack=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/librustc_workspace_hack-263679662381a714.rlib --extern rustc_version=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/librustc_version-4e646ad4ad2caed1.rlib --extern shell_escape=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libshell_escape-629c2d769c93c1fe.rlib -C target-cpu=native -L native=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/backtrace-sys-c58be1a2cb46f39c/out`
rustc command: "LD_LIBRARY_PATH"="/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2/lib:/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/release/deps:/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2/lib" "/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--edition=2018" "--crate-name" "miri" "src/tools/miri/src/lib.rs" "--color" "always" "--crate-type" "lib" "--emit=dep-info,link" "-C" "opt-level=2" "--cfg" "feature=\"cargo_metadata\"" "--cfg" "feature=\"cargo_miri\"" "--cfg" "feature=\"default\"" "--cfg" "feature=\"directories\"" "--cfg" "feature=\"rustc_version\"" "-C" "metadata=1fcdbf5965d738e2" "-C" "extra-filename=-1fcdbf5965d738e2" "--out-dir" "/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps" "--target" "x86_64-unknown-linux-gnu" "-C" "incremental=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/incremental" "-L" "dependency=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps" "-L" "dependency=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/release/deps" "--extern" "byteorder=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libbyteorder-71865cc79aa4c3c4.rlib" "--extern" "cargo_metadata=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libcargo_metadata-be77b09321489336.rlib" "--extern" "directories=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libdirectories-7a23c6d906c1075b.rlib" "--extern" "env_logger=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libenv_logger-a50026f26f34e582.rlib" "--extern" "hex=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libhex-c562909d426f1198.rlib" "--extern" "log=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/liblog-8ef340c0ab523d07.rlib" "--extern" "rand=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/librand-c5e057ba9777126f.rlib" "--extern" "rustc_workspace_hack=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/librustc_workspace_hack-263679662381a714.rlib" "--extern" "rustc_version=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/librustc_version-4e646ad4ad2caed1.rlib" "--extern" "shell_escape=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libshell_escape-629c2d769c93c1fe.rlib" "-C" "target-cpu=native" "-L" "native=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/backtrace-sys-c58be1a2cb46f39c/out" "--cfg" "stage2" "-Cdebuginfo=2" "--sysroot" "/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2" "-Zexternal-macro-backtrace" "-C" "debug-assertions=n" "-C" "codegen-units=1" "-C" "link-args=-Wl,-rpath,$ORIGIN/../lib" "-Zunstable-options"
sysroot: "/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2"
libdir: "/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2/lib"
error[E0061]: this function takes 3 parameters but 2 parameters were supplied
   --> src/tools/miri/src/operator.rs:161:35
    |
161 |                     self.memory().check_bounds_ptr(left, InboundsCheck::Live)?;
    |                                   ^^^^^^^^^^^^^^^^ expected 3 parameters

error[E0061]: this function takes 3 parameters but 2 parameters were supplied
   --> src/tools/miri/src/operator.rs:162:35
    |
162 |                     self.memory().check_bounds_ptr(right, InboundsCheck::Live)?;
    |                                   ^^^^^^^^^^^^^^^^ expected 3 parameters

error[E0061]: this function takes 3 parameters but 2 parameters were supplied
   --> src/tools/miri/src/operator.rs:186:38
    |
186 |                     if self.memory().check_bounds_ptr(ptr, InboundsCheck::MaybeDead).is_ok() {
    |                                      ^^^^^^^^^^^^^^^^ expected 3 parameters

error[E0061]: this function takes 4 parameters but 3 parameters were supplied
   --> src/tools/miri/src/stacked_borrows.rs:553:15
    |
553 |         alloc.check_bounds(this, ptr, size)?;
    |               ^^^^^^^^^^^^ expected 4 parameters

error[E0061]: this function takes 3 parameters but 2 parameters were supplied
   --> src/tools/miri/src/operator.rs:343:27
    |
343 |             self.memory().check_bounds_ptr(ptr, InboundsCheck::Live)?;
    |                           ^^^^^^^^^^^^^^^^ expected 3 parameters

error[E0061]: this function takes 3 parameters but 2 parameters were supplied
   --> src/tools/miri/src/operator.rs:345:27
    |
345 |             self.memory().check_bounds_ptr(ptr, InboundsCheck::Live)?;
    |                           ^^^^^^^^^^^^^^^^ expected 3 parameters

error: aborting due to 6 previous errors

For more information about this error, try `rustc --explain E0061`.
[RUSTC-TIMING] miri test:false 2.379
error: Could not compile `miri`.

Caused by:
  process didn't exit successfully: `/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/bootstrap/debug/rustc --edition=2018 --crate-name miri src/tools/miri/src/lib.rs --color always --error-format json --crate-type lib --emit=dep-info,link -C opt-level=2 --cfg 'feature="cargo_metadata"' --cfg 'feature="cargo_miri"' --cfg 'feature="default"' --cfg 'feature="directories"' --cfg 'feature="rustc_version"' -C metadata=1fcdbf5965d738e2 -C extra-filename=-1fcdbf5965d738e2 --out-dir /home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps --target x86_64-unknown-linux-gnu -C incremental=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/incremental -L dependency=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps -L dependency=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/release/deps --extern byteorder=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libbyteorder-71865cc79aa4c3c4.rlib --extern cargo_metadata=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libcargo_metadata-be77b09321489336.rlib --extern directories=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libdirectories-7a23c6d906c1075b.rlib --extern env_logger=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libenv_logger-a50026f26f34e582.rlib --extern hex=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libhex-c562909d426f1198.rlib --extern log=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/liblog-8ef340c0ab523d07.rlib --extern rand=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/librand-c5e057ba9777126f.rlib --extern rustc_workspace_hack=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/librustc_workspace_hack-263679662381a714.rlib --extern rustc_version=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/librustc_version-4e646ad4ad2caed1.rlib --extern shell_escape=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libshell_escape-629c2d769c93c1fe.rlib -C target-cpu=native -L native=/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/build/backtrace-sys-c58be1a2cb46f39c/out` (exit code: 1)
command did not execute successfully: "/home/user/build/2nonpkgs/rust.stuff/rust/rust/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "6" "-v" "--release" "--manifest-path" "/home/user/build/2nonpkgs/rust.stuff/rust/rust/src/tools/miri/Cargo.toml" "--message-format" "json"
expected success, got: exit code: 101
[TIMING] ToolBuild { compiler: Compiler { stage: 2, host: "x86_64-unknown-linux-gnu" }, target: "x86_64-unknown-linux-gnu", tool: "miri", path: "src/tools/miri", mode: ToolRustc, is_optional_tool: true, source_type: Submodule, extra_features: [] } -- 2.642
  < ToolBuild { compiler: Compiler { stage: 2, host: "x86_64-unknown-linux-gnu" }, target: "x86_64-unknown-linux-gnu", tool: "miri", path: "src/tools/miri", mode: ToolRustc, is_optional_tool: true, source_type: Submodule, extra_features: [] }
< Miri { compiler: Compiler { stage: 2, host: "x86_64-unknown-linux-gnu" }, target: "x86_64-unknown-linux-gnu", extra_features: [] }
Build completed successfully in 0:00:10

real	0m10.656s
user	0m9.156s
sys	0m1.200s

[RalfJung]

The fix is in progress at rust-lang/miri#746.

Building Miri takes 34min for you? oO wow.

Building Miri takes 34min for you?

ah no, that was the output from building rust.