diff options
| author | Tyler Mandry <tmandry@gmail.com> | 2019-05-30 13:28:31 -0700 |
|---|---|---|
| committer | Tyler Mandry <tmandry@gmail.com> | 2019-06-04 16:14:36 -0700 |
| commit | 3d682cd941c6936018c8330256549fb5e97296f7 (patch) | |
| tree | 6751d785a6b55345ff7ee875098c9ea39d5f4a75 | |
| parent | 5d8f59f4b1473217c2de7e02330b5aaae70a1668 (diff) | |
| download | rust-3d682cd941c6936018c8330256549fb5e97296f7.tar.gz rust-3d682cd941c6936018c8330256549fb5e97296f7.zip | |
Revert "Make MaybeStorageLive drop-aware"
This reverts commit dd2eabc49d415dd30cea0953df5d7659d4d9440f.
| -rw-r--r-- | src/librustc_mir/dataflow/impls/storage_liveness.rs | 13 |
1 files 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 0fb66032a17..9bf346f5f62 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( |