simplify-locals: Remove unused assignments regardless of rvalue kind

1 files changed, 1 insertions, 25 deletions

diff --git a/compiler/rustc_mir/src/transform/simplify.rs b/compiler/rustc_mir/src/transform/simplify.rs
index 183111877d1..b7c9a3a8688 100644
--- a/compiler/rustc_mir/src/transform/simplify.rs
+++ b/compiler/rustc_mir/src/transform/simplify.rs
@@ -439,31 +439,7 @@ impl Visitor<'_> for UsedLocals {
             StatementKind::StorageLive(_local) | StatementKind::StorageDead(_local) => {}
 
             StatementKind::Assign(box (ref place, ref rvalue)) => {
-                let can_skip = match rvalue {
-                    Rvalue::Use(_)
-                    | Rvalue::Discriminant(_)
-                    | Rvalue::BinaryOp(_, _, _)
-                    | Rvalue::CheckedBinaryOp(_, _, _)
-                    | Rvalue::Repeat(_, _)
-                    | Rvalue::AddressOf(_, _)
-                    | Rvalue::Len(_)
-                    | Rvalue::UnaryOp(_, _)
-                    | Rvalue::Aggregate(_, _) => true,
-
-                    Rvalue::Ref(..)
-                    | Rvalue::ThreadLocalRef(..)
-                    | Rvalue::Cast(..)
-                    | Rvalue::NullaryOp(..) => false,
-                };
-                if can_skip {
-                    self.visit_lhs(place, location);
-                } else {
-                    self.visit_place(
-                        place,
-                        PlaceContext::MutatingUse(MutatingUseContext::Store),
-                        location,
-                    );
-                }
+                self.visit_lhs(place, location);
                 self.visit_rvalue(rvalue, location);
             }