From a418fe9826b4b2aa0a2f9d6c26d82673262a757a Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Mon, 2 Dec 2019 20:20:11 -0500
Subject: [PATCH] Rustup for `BodyCache` changes

---
 rust-version               | 2 +-
 src/helpers.rs             | 2 +-
 src/shims/foreign_items.rs | 4 ++--
 src/shims/mod.rs           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rust-version b/rust-version
index ebf6e5a2aca..08289d4459e 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-2da942f32802c8233a09744024dfbc34431adf65
+fdc0011561c6365c596dfd8fa1ef388162bc89c7
diff --git a/src/helpers.rs b/src/helpers.rs
index 7bd29e17419..e7da88f2bbf 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -131,7 +131,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         let this = self.eval_context_mut();
 
         // Push frame.
-        let mir = this.load_mir(f.def, None)?;
+        let mir = this.load_mir(f.def, None)?.body();
         let span = this.stack().last()
             .and_then(Frame::current_source_info)
             .map(|si| si.span)
diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs
index f27b4fb3335..52e04aea304 100644
--- a/src/shims/foreign_items.rs
+++ b/src/shims/foreign_items.rs
@@ -141,14 +141,14 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                     .expect("No panic runtime found!");
                 let panic_runtime = tcx.crate_name(*panic_runtime);
                 let start_panic_instance = this.resolve_path(&[&*panic_runtime.as_str(), "__rust_start_panic"])?;
-                return Ok(Some(this.load_mir(start_panic_instance.def, None)?));
+                return Ok(Some(this.load_mir(start_panic_instance.def, None)?.body()));
             }
             // Similarly, we forward calls to the `panic_impl` foreign item to its implementation.
             // The implementation is provided by the function with the `#[panic_handler]` attribute.
             "panic_impl" => {
                 let panic_impl_id = this.tcx.lang_items().panic_impl().unwrap();
                 let panic_impl_instance = ty::Instance::mono(*this.tcx, panic_impl_id);
-                return Ok(Some(this.load_mir(panic_impl_instance.def, None)?));
+                return Ok(Some(this.load_mir(panic_impl_instance.def, None)?.body()));
             }
 
             "exit" | "ExitProcess" => {
diff --git a/src/shims/mod.rs b/src/shims/mod.rs
index 2e8aea3f86e..d7842dbcba2 100644
--- a/src/shims/mod.rs
+++ b/src/shims/mod.rs
@@ -49,7 +49,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         }
 
         // Otherwise, load the MIR.
-        Ok(Some(this.load_mir(instance.def, None)?))
+        Ok(Some(this.load_mir(instance.def, None)?.body()))
     }
 
     fn align_offset(