diff options
| author | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2022-03-23 17:01:04 +0000 |
|---|---|---|
| committer | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2022-03-23 17:01:04 +0000 |
| commit | 2dcf55d10d1c60b96ce73b9b0c8554d00bc5a7a6 (patch) | |
| tree | 32c8a6c4a5eb9aa9e10f81e799fc8d871e6902cf | |
| parent | c7efad044c0f5f7d1aa25f8f7b9fd205087f8da4 (diff) | |
| download | rust-2dcf55d10d1c60b96ce73b9b0c8554d00bc5a7a6.tar.gz rust-2dcf55d10d1c60b96ce73b9b0c8554d00bc5a7a6.zip | |
Address rebase fallout
| -rw-r--r-- | compiler/rustc_mir_transform/src/const_prop_lint.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_mir_transform/src/const_prop_lint.rs b/compiler/rustc_mir_transform/src/const_prop_lint.rs index 969d7178b86..5be745bc1de 100644 --- a/compiler/rustc_mir_transform/src/const_prop_lint.rs +++ b/compiler/rustc_mir_transform/src/const_prop_lint.rs @@ -235,7 +235,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine<'mir, 'tcx> ) -> InterpResult<'tcx, InterpOperand<Self::PointerTag>> { let l = &frame.locals[local]; - if l.value == LocalValue::Uninitialized { + if l.value == LocalValue::Unallocated { throw_machine_stop_str!("tried to access an uninitialized local") } @@ -433,7 +433,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> { /// but not reading from them anymore. fn remove_const(ecx: &mut InterpCx<'mir, 'tcx, ConstPropMachine<'mir, 'tcx>>, local: Local) { ecx.frame_mut().locals[local] = - LocalState { value: LocalValue::Uninitialized, layout: Cell::new(None) }; + LocalState { value: LocalValue::Unallocated, layout: Cell::new(None) }; } fn lint_root(&self, source_info: SourceInfo) -> Option<HirId> { @@ -906,7 +906,7 @@ impl<'tcx> Visitor<'tcx> for ConstPropagator<'_, 'tcx> { let frame = self.ecx.frame_mut(); frame.locals[local].value = if let StatementKind::StorageLive(_) = statement.kind { - LocalValue::Uninitialized + LocalValue::Unallocated } else { LocalValue::Dead }; |
