diff --git a/rust-version b/rust-version index ebf6e5a2aca8..08289d4459e7 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -2da942f32802c8233a09744024dfbc34431adf65 +fdc0011561c6365c596dfd8fa1ef388162bc89c7 diff --git a/src/helpers.rs b/src/helpers.rs index 7bd29e174194..e7da88f2bbfe 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -131,7 +131,7 @@ fn call_function( 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 f27b4fb33352..52e04aea3045 100644 --- a/src/shims/foreign_items.rs +++ b/src/shims/foreign_items.rs @@ -141,14 +141,14 @@ fn emulate_foreign_item( .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 2e8aea3f86e0..d7842dbcba25 100644 --- a/src/shims/mod.rs +++ b/src/shims/mod.rs @@ -49,7 +49,7 @@ fn find_fn( } // Otherwise, load the MIR. - Ok(Some(this.load_mir(instance.def, None)?)) + Ok(Some(this.load_mir(instance.def, None)?.body())) } fn align_offset(