Skip to content

Commit ce41e48

Browse files
committed
Auto merge of #60937 - RalfJung:miri, r=oli-obk
update Miri r? @oli-obk
2 parents e0d2f74 + 5f5e30f commit ce41e48

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Diff for: src/librustc_mir/interpret/eval_context.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,9 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'a, 'mir, 'tcx>> InterpretCx<'a, 'mir, 'tc
613613
trace!("{:?} is now live", local);
614614

615615
let local_val = LocalValue::Uninitialized;
616-
// StorageLive *always* kills the value that's currently stored
616+
// StorageLive *always* kills the value that's currently stored.
617+
// However, we do not error if the variable already is live;
618+
// see <https://github.com/rust-lang/rust/issues/42371>.
617619
Ok(mem::replace(&mut self.frame_mut().locals[local].value, local_val))
618620
}
619621

0 commit comments

Comments
 (0)