From 3d682cd941c6936018c8330256549fb5e97296f7 Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Thu, 30 May 2019 13:28:31 -0700 Subject: [PATCH] Revert "Make MaybeStorageLive drop-aware" This reverts commit dd2eabc49d415dd30cea0953df5d7659d4d9440f. --- src/librustc_mir/dataflow/impls/storage_liveness.rs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/librustc_mir/dataflow/impls/storage_liveness.rs b/src/librustc_mir/dataflow/impls/storage_liveness.rs index 0fb66032a171..9bf346f5f62d 100644 --- a/src/librustc_mir/dataflow/impls/storage_liveness.rs +++ b/src/librustc_mir/dataflow/impls/storage_liveness.rs @@ -43,16 +43,9 @@ impl<'a, 'tcx> BitDenotation<'tcx> for MaybeStorageLive<'a, 'tcx> { } fn terminator_effect(&self, - sets: &mut BlockSets<'_, Local>, - loc: Location) { - match &self.mir[loc.block].terminator().kind { - TerminatorKind::Drop { location, .. } => { - if let Some(l) = location.local_or_deref_local() { - sets.kill(l); - } - } - _ => (), - } + _sets: &mut BlockSets<'_, Local>, + _loc: Location) { + // Terminators have no effect } fn propagate_call_return(