Auto merge of #69344 - RalfJung:miri, r=oli-obk

bump Miri

Fixes https://github.com/rust-lang/rust/issues/69331

r? @ghost Cc @oli-obk

2 files changed, 10 insertions, 8 deletions

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index f939f79e4f4..4cfda606c4b 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -388,6 +388,8 @@ impl Step for Miri {
             cargo.env("XARGO_RUST_SRC", builder.src.join("src"));
             // Debug things.
             cargo.env("RUST_BACKTRACE", "1");
+            // Overwrite bootstrap's `rustc` wrapper overwriting our flags.
+            cargo.env("RUSTC_DEBUG_ASSERTIONS", "true");
             // Let cargo-miri know where xargo ended up.
             cargo.env("XARGO", builder.out.join("bin").join("xargo"));
 
@@ -397,7 +399,7 @@ impl Step for Miri {
             }
 
             // # Determine where Miri put its sysroot.
-            // To this end, we run `cargo miri setup --env` and capture the output.
+            // To this end, we run `cargo miri setup --print-sysroot` and capture the output.
             // (We do this separately from the above so that when the setup actually
             // happens we get some output.)
             // We re-use the `cargo` from above.
diff --git a/src/tools/miri b/src/tools/miri
-Subproject ded5a52639a78907523b74a9d3ed8e3824c88ca
+Subproject 3c444bf6a6cff3b9014005f21cc44995b34862c