user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unsafe code

Browse source
This commit is contained in:
bjorn3 2018-04-07 10:44:19 +02:00 • committed by Oliver Schneider
parent e09a996b2a
commit 73658c40bb
No known key found for this signature in database
GPG key ID: 1D5CB4FC597C3004
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
miri/lib.rs
View file

@ -309,17 +309,14 @@ impl<'mir, 'tcx: 'mir> Machine<'mir, 'tcx> for Evaluator<'tcx> {
let call_stackframe = ecx.stack().len();
while ecx.step()? && ecx.stack().len() >= call_stackframe {
if ecx.stack().len() == call_stackframe {
let frame = ecx.stack().last().unwrap();
let frame = ecx.frame_mut();
let bb = &frame.mir.basic_blocks()[frame.block];
if bb.statements.len() == frame.stmt && !bb.is_cleanup {
match bb.terminator().kind {
::rustc::mir::TerminatorKind::Return => {
for (local, _local_decl) in mir.local_decls.iter_enumerated().skip(1) {
// Don't deallocate locals, because the return value might reference them
// ------------------------------------------------------------
// ||||||||||||| TODO: remove this horrible hack ||||||||||||||
// ------------------------------------------------------------
unsafe { &mut *(frame as *const Frame as *mut Frame) }.storage_dead(local);
frame.storage_dead(local);
}
}
_ => {}