OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #60937 - RalfJung:miri, r=oli-obk

Browse Source 
update Miri

r? @oli-obk
This commit is contained in:
bors 2019-05-19 08:56:24 +00:00
commit ce41e48362
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc_mir/interpret/eval_context.rs
View File

@ -613,7 +613,9 @@ impl<'a, 'mir, 'tcx: 'mir, M: Machine<'a, 'mir, 'tcx>> InterpretCx<'a, 'mir, 'tc
trace!("{:?} is now live", local); trace!("{:?} is now live", local);
let local_val = LocalValue::Uninitialized; 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 <https://github.com/rust-lang/rust/issues/42371>.
Ok(mem::replace(&mut self.frame_mut().locals[local].value, local_val)) Ok(mem::replace(&mut self.frame_mut().locals[local].value, local_val))
} }

2
src/tools/miri

@ -1 +1 @@
Subproject commit bc0c76d861a178911f3f506196a7404eda1e690d Subproject commit 37b2eea7144d022702f0d2eedcc4c776db15d078