From a272c456783e145ea0f91a0b423398e9927147bf Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 30 May 2022 10:17:46 +0200
Subject: [PATCH 1/3] update Miri

---
 Cargo.lock     | 55 +++++++++++++++++++++++++++++++++++++++++++++++---
 src/tools/miri |  2 +-
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 402e734dc76..c066d1b0a5b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -220,7 +220,7 @@ dependencies = [
  "libc",
  "once_cell",
  "opener",
- "pretty_assertions",
+ "pretty_assertions 0.7.2",
  "serde",
  "serde_json",
  "tar",
@@ -883,6 +883,20 @@ dependencies = [
  "cfg-if 0.1.10",
 ]
 
+[[package]]
+name = "crossbeam"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.4"
@@ -917,6 +931,16 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.8"
@@ -2415,17 +2439,18 @@ name = "miri"
 version = "0.1.0"
 dependencies = [
  "colored",
- "compiletest_rs",
  "env_logger 0.9.0",
  "getrandom 0.2.0",
+ "lazy_static",
  "libc",
  "log",
  "measureme 9.1.2",
  "rand 0.8.5",
+ "regex",
  "rustc-workspace-hack",
- "rustc_version",
  "shell-escape",
  "smallvec",
+ "ui_test",
 ]
 
 [[package]]
@@ -2866,6 +2891,18 @@ dependencies = [
  "output_vt100",
 ]
 
+[[package]]
+name = "pretty_assertions"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563"
+dependencies = [
+ "ansi_term",
+ "ctor",
+ "diff",
+ "output_vt100",
+]
+
 [[package]]
 name = "pretty_env_logger"
 version = "0.4.0"
@@ -5462,6 +5499,18 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
 
+[[package]]
+name = "ui_test"
+version = "0.1.0"
+dependencies = [
+ "colored",
+ "crossbeam",
+ "lazy_static",
+ "pretty_assertions 1.2.1",
+ "regex",
+ "rustc_version",
+]
+
 [[package]]
 name = "unic-char-property"
 version = "0.9.0"
diff --git a/src/tools/miri b/src/tools/miri
index 22c97b33e47..065ff89e33b 160000
--- a/src/tools/miri
+++ b/src/tools/miri
@@ -1 +1 @@
-Subproject commit 22c97b33e470d0b7c085e98417bef8b362d43d4e
+Subproject commit 065ff89e33b67b3527fcdd56cf8b432e593e32d4

From 3c6693967149a176735c72e54df2e9350ab45f10 Mon Sep 17 00:00:00 2001
From: Oli Scherer <github35764891676564198441@oli-obk.de>
Date: Mon, 30 May 2022 12:10:28 +0200
Subject: [PATCH 2/3] Let miri decide the flags to use for the test suite

---
 src/bootstrap/test.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 99e9e8794e3..30e577a5172 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -572,8 +572,6 @@ fn run(self, builder: &Builder<'_>) {
                 return;
             }
 
-            // # Run `cargo test` with `-Zmir-opt-level=4`.
-            cargo.env("MIRIFLAGS", "-O -Zmir-opt-level=4");
             if !try_run(builder, &mut cargo) {
                 return;
             }

From 962d54e5e8e58319ebaea389ab1314d3367c594d Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 30 May 2022 12:35:01 +0200
Subject: [PATCH 3/3] be less redundant redundant

---
 src/bootstrap/test.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 30e577a5172..b71bf62fe45 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -572,10 +572,6 @@ fn run(self, builder: &Builder<'_>) {
                 return;
             }
 
-            if !try_run(builder, &mut cargo) {
-                return;
-            }
-
             // # Done!
             builder.save_toolstate("miri", ToolState::TestPass);
         } else {