diff options
| -rw-r--r-- | src/librustc_mir/interpret/validation.rs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/librustc_mir/interpret/validation.rs b/src/librustc_mir/interpret/validation.rs index f6986f2de05..3756fca2344 100644 --- a/src/librustc_mir/interpret/validation.rs +++ b/src/librustc_mir/interpret/validation.rs @@ -11,7 +11,7 @@ use super::{ EvalError, EvalResult, EvalErrorKind, EvalContext, DynamicLifetime, AccessKind, LockInfo, - PrimVal, Value, + Value, Lvalue, LvalueExtra, Machine, }; @@ -181,16 +181,11 @@ std::sync::atomic::AtomicBool::get_mut$|\ // HACK: For now, bail out if we hit a dead local during recovery (can happen because sometimes we have // StorageDead before EndRegion). // TODO: We should rather fix the MIR. - // HACK: Releasing on dead/undef local variables is a NOP. This can happen because of releases being added - // before drop elaboration. - // TODO: Fix the MIR so that these releases do not happen. match query.lval { Lvalue::Local { frame, local } => { let res = self.stack[frame].get_local(local); match (res, mode) { - (Err(EvalError{ kind: EvalErrorKind::DeadLocal, ..}), ValidationMode::Recover(_)) | - (Err(EvalError{ kind: EvalErrorKind::DeadLocal, ..}), ValidationMode::Release) | - (Ok(Value::ByVal(PrimVal::Undef)), ValidationMode::Release) => { + (Err(EvalError{ kind: EvalErrorKind::DeadLocal, ..}), ValidationMode::Recover(_)) => { return Ok(()); } _ => {}, |