From a226b53b585d824f2268811894aa08e2495bc025 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 18 May 2019 14:40:17 +0200 Subject: [PATCH 1/2] expand comment in StorageLive --- src/librustc_mir/interpret/eval_context.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/librustc_mir/interpret/eval_context.rs b/src/librustc_mir/interpret/eval_context.rs index db827afdb94f4..d4c1e5416d565 100644 --- a/src/librustc_mir/interpret/eval_context.rs +++ b/src/librustc_mir/interpret/eval_context.rs @@ -613,7 +613,9 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'a, 'mir, 'tcx>> InterpretCx<'a, 'mir, 'tc trace!("{:?} is now live", local); let local_val = LocalValue::Uninitialized; - // StorageLive *always* kills the value that's currently stored + // StorageLive *always* kills the value that's currently stored. + // However, we do not error if the variable already is live; + // see . Ok(mem::replace(&mut self.frame_mut().locals[local].value, local_val)) } From 5f5e30fd548a1cb223a8ed00abf949d5ca536fc4 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 18 May 2019 14:40:34 +0200 Subject: [PATCH 2/2] update miri --- src/tools/miri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/miri b/src/tools/miri index bc0c76d861a17..37b2eea7144d0 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit bc0c76d861a178911f3f506196a7404eda1e690d +Subproject commit 37b2eea7144d022702f0d2eedcc4c776db15d078