diff --git a/rust-version b/rust-version index a812b46de17f..9a662aa0c26c 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -9a12971da5c08f9a95d54bdaef5cd83698ed4509 +235938d1acdd93d6641a741c81f64e415b786751 diff --git a/src/helpers.rs b/src/helpers.rs index 7d22b85b18eb..568e9c925d55 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -128,7 +128,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`. diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs index 641b8b256363..e0eb0df87c48 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"