diff --git a/rust-version b/rust-version index 7266b1bd0ab0..bc65b5b6751b 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -5c5c8eb864e56ce905742b8e97df5506bba6aeef +e862c01aadb2d029864f7bb256cf6c85bbb5d7e4 diff --git a/src/helpers.rs b/src/helpers.rs index 05a92164f27d..763ab403f192 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)?.body(); + let mir = &*this.load_mir(f.def, None)?; 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 316cc686ad77..a983c0b11fa2 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)?.body())); + return Ok(Some(&*this.load_mir(start_panic_instance.def, None)?)); } // 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)?.body())); + return Ok(Some(&*this.load_mir(panic_impl_instance.def, None)?)); } "exit" | "ExitProcess" => { diff --git a/src/shims/mod.rs b/src/shims/mod.rs index 21e69dc1f0fc..06ef58eaf526 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)?.body())) + Ok(Some(&*this.load_mir(instance.def, None)?)) } fn align_offset(