From 1ef1d581d3900e34dd6db58f20322474dad71a54 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 15 Sep 2019 23:27:58 +0200
Subject: [PATCH 1/2] update for rustc changes

---
 rust-version    | 2 +-
 src/bin/miri.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust-version b/rust-version
index 60ef1e36f7..07e965d7c3 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-b35ebac96102cd12406d9d87827b0838d129c278
+96d07e0ac9f0c56b95a2561c6cedac0b23a5d2a3
diff --git a/src/bin/miri.rs b/src/bin/miri.rs
index 6e4bf4a6c2..7b3dbeacc4 100644
--- a/src/bin/miri.rs
+++ b/src/bin/miri.rs
@@ -211,7 +211,7 @@ fn main() {
         seed,
         args: miri_args,
     };
-    let result = rustc_driver::report_ices_to_stderr_if_any(move || {
+    let result = rustc_driver::catch_fatal_errors(move || {
         rustc_driver::run_compiler(&rustc_args, &mut MiriCompilerCalls { miri_config }, None, None)
     }).and_then(|result| result);
     std::process::exit(result.is_err() as i32);

From 9e2107cef59e3ca2f2c2687ec85533177de0a337 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 16 Sep 2019 09:31:56 +0200
Subject: [PATCH 2/2] install ICE hook

---
 src/bin/miri.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bin/miri.rs b/src/bin/miri.rs
index 7b3dbeacc4..dd56f0a6e5 100644
--- a/src/bin/miri.rs
+++ b/src/bin/miri.rs
@@ -211,6 +211,7 @@ fn main() {
         seed,
         args: miri_args,
     };
+    rustc_driver::install_ice_hook();
     let result = rustc_driver::catch_fatal_errors(move || {
         rustc_driver::run_compiler(&rustc_args, &mut MiriCompilerCalls { miri_config }, None, None)
     }).and_then(|result| result);