From 3911388e06694f4ddbd7045f8684f905090e9e84 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 1 Apr 2020 19:12:22 +0200
Subject: [PATCH 1/2] remove ICEin intrinsic

---
 src/shims/intrinsics.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs
index 641b8b25636..e0eb0df87c4 100644
--- a/src/shims/intrinsics.rs
+++ b/src/shims/intrinsics.rs
@@ -217,8 +217,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 this.write_immediate(*val, place.into())?;
             }
 
-            "breakpoint" => unimplemented!(), // halt miri
-
             #[rustfmt::skip]
             | "copy"
             | "copy_nonoverlapping"

From 1e3800ffb1b74d51f68f6d63306ff94b4297eb73 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 1 Apr 2020 19:40:10 +0200
Subject: [PATCH 2/2] rustup

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

diff --git a/rust-version b/rust-version
index a812b46de17..9a662aa0c26 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-9a12971da5c08f9a95d54bdaef5cd83698ed4509
+235938d1acdd93d6641a741c81f64e415b786751
diff --git a/src/helpers.rs b/src/helpers.rs
index 15f1b286de2..e95b0d850b6 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -115,7 +115,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
     fn local_place(&mut self, local: mir::Local) -> InterpResult<'tcx, PlaceTy<'tcx, Tag>> {
         let this = self.eval_context_mut();
         let place = mir::Place { local: local, projection: List::empty() };
-        this.eval_place(&place)
+        this.eval_place(place)
     }
 
     /// Generate some random bytes, and write them to `dest`.