Visit only statements in always live locals

No functional changes intended.

1 files changed, 12 insertions, 19 deletions

diff --git a/compiler/rustc_mir/src/util/storage.rs b/compiler/rustc_mir/src/util/storage.rs
index 0b7b1c29537..4e1696cd716 100644
--- a/compiler/rustc_mir/src/util/storage.rs
+++ b/compiler/rustc_mir/src/util/storage.rs
@@ -1,6 +1,5 @@
 use rustc_index::bit_set::BitSet;
-use rustc_middle::mir::visit::Visitor;
-use rustc_middle::mir::{self, Local, Location};
+use rustc_middle::mir::{self, Local};
 
 /// The set of locals in a MIR body that do not have `StorageLive`/`StorageDead` annotations.
 ///
@@ -13,12 +12,18 @@ pub struct AlwaysLiveLocals(BitSet<Local>);
 
 impl AlwaysLiveLocals {
     pub fn new(body: &mir::Body<'tcx>) -> Self {
-        let mut ret = AlwaysLiveLocals(BitSet::new_filled(body.local_decls.len()));
-
-        let mut vis = StorageAnnotationVisitor(&mut ret);
-        vis.visit_body(body);
+        let mut always_live_locals = AlwaysLiveLocals(BitSet::new_filled(body.local_decls.len()));
+
+        for block in body.basic_blocks() {
+            for statement in &block.statements {
+                use mir::StatementKind::{StorageDead, StorageLive};
+                if let StorageLive(l) | StorageDead(l) = statement.kind {
+                    always_live_locals.0.remove(l);
+                }
+            }
+        }
 
-        ret
+        always_live_locals
     }
 
     pub fn into_inner(self) -> BitSet<Local> {
@@ -33,15 +38,3 @@ impl std::ops::Deref for AlwaysLiveLocals {
         &self.0
     }
 }
-
-/// Removes locals that have `Storage*` annotations from `AlwaysLiveLocals`.
-struct StorageAnnotationVisitor<'a>(&'a mut AlwaysLiveLocals);
-
-impl Visitor<'tcx> for StorageAnnotationVisitor<'_> {
-    fn visit_statement(&mut self, statement: &mir::Statement<'tcx>, _location: Location) {
-        use mir::StatementKind::{StorageDead, StorageLive};
-        if let StorageLive(l) | StorageDead(l) = statement.kind {
-            (self.0).0.remove(l);
-        }
-    }
-}