From 821c4408f9752b17c40b9cb879fc5f430136ecd8 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Fri, 21 Feb 2020 11:50:15 +0100
Subject: [PATCH 1/3] bump Miri

---
 src/tools/miri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/miri b/src/tools/miri
index ded5a52639a78..5b8462066d995 160000
--- a/src/tools/miri
+++ b/src/tools/miri
@@ -1 +1 @@
-Subproject commit ded5a52639a78907523b74a9d3ed8e3824c88ca5
+Subproject commit 5b8462066d99511a5ca119cbd3a1443ccf675714

From 1a0e2001bca6cbb3fc8496b83d5f847e11f459e6 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Fri, 21 Feb 2020 20:45:16 +0100
Subject: [PATCH 2/3] fix miri and bootstrap interaction

---
 src/bootstrap/test.rs | 4 +++-
 src/tools/miri        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index f939f79e4f4b7..4cfda606c4bc8 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
index 5b8462066d995..a3dad216eeab5 160000
--- a/src/tools/miri
+++ b/src/tools/miri
@@ -1 +1 @@
-Subproject commit 5b8462066d99511a5ca119cbd3a1443ccf675714
+Subproject commit a3dad216eeab5be4ffb050afb9ab2b2c67ee4513

From ffa1aa6434a8110a10e2fa0de4dce9176578476b Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 24 Feb 2020 13:08:24 +0100
Subject: [PATCH 3/3] bump Miri once more

---
 src/tools/miri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/miri b/src/tools/miri
index a3dad216eeab5..3c444bf6a6cff 160000
--- a/src/tools/miri
+++ b/src/tools/miri
@@ -1 +1 @@
-Subproject commit a3dad216eeab5be4ffb050afb9ab2b2c67ee4513
+Subproject commit 3c444bf6a6cff3b9014005f21cc44995b34862ce