Update the tests after the change to copy_prop in #143509

Author: ohadravid

tests/mir-opt/copy-prop/borrowed_local.borrow_in_loop.CopyProp.panic-abort.diff

@@ -43,12 +43,12 @@
       }
 
       bb1: {
--         StorageLive(_6);
+          StorageLive(_6);
           StorageLive(_7);
           _7 = copy (*_2);
           _6 = Not(move _7);
           StorageDead(_7);
--         StorageLive(_8);
+          StorageLive(_8);
           StorageLive(_9);
           _9 = copy (*_2);
           _8 = Not(move _9);
@@ -80,8 +80,8 @@
 -         StorageDead(_14);
           _0 = const ();
           StorageDead(_13);
--         StorageDead(_8);
--         StorageDead(_6);
+          StorageDead(_8);
+          StorageDead(_6);
 -         StorageDead(_4);
           StorageDead(_2);
           StorageDead(_1);
@@ -93,8 +93,8 @@
 -         StorageDead(_14);
 -         _5 = const ();
           StorageDead(_13);
--         StorageDead(_8);
--         StorageDead(_6);
+          StorageDead(_8);
+          StorageDead(_6);
           goto -> bb1;
       }
   }

tests/mir-opt/copy-prop/borrowed_local.borrow_in_loop.CopyProp.panic-unwind.diff

@@ -43,12 +43,12 @@
       }
 
       bb1: {
--         StorageLive(_6);
+          StorageLive(_6);
           StorageLive(_7);
           _7 = copy (*_2);
           _6 = Not(move _7);
           StorageDead(_7);
--         StorageLive(_8);
+          StorageLive(_8);
           StorageLive(_9);
           _9 = copy (*_2);
           _8 = Not(move _9);
@@ -80,8 +80,8 @@
 -         StorageDead(_14);
           _0 = const ();
           StorageDead(_13);
--         StorageDead(_8);
--         StorageDead(_6);
+          StorageDead(_8);
+          StorageDead(_6);
 -         StorageDead(_4);
           StorageDead(_2);
           StorageDead(_1);
@@ -93,8 +93,8 @@
 -         StorageDead(_14);
 -         _5 = const ();
           StorageDead(_13);
--         StorageDead(_8);
--         StorageDead(_6);
+          StorageDead(_8);
+          StorageDead(_6);
           goto -> bb1;
       }
   }

tests/mir-opt/copy-prop/copy_prop_storage_removed_when_local_borrowed.f.CopyProp.diff

@@ -8,12 +8,11 @@
       let mut _4: &T;
 
       bb0: {
--         StorageLive(_2);
+          StorageLive(_2);
           _2 = copy (_1.0: T);
--         _3 = copy _2;
--         _4 = &_3;
--         StorageDead(_2);
-+         _4 = &_2;
+          _3 = copy _2;
+          _4 = &_3;
+          StorageDead(_2);
           _0 = copy (*_4);
           return;
       }

tests/mir-opt/copy-prop/copy_prop_storage_removed_when_local_borrowed.rs

@@ -18,9 +18,12 @@ pub fn f<T: Copy + Freeze>(_1: (T, T)) -> T {
         let _4: &T;
         // CHECK: bb0: {
         {
-            // CHECK-NOT: StorageLive(_2);
-            // CHECK: _4 = &_2;
-            // CHECK-NOT: StorageDead(_2);
+            // FIXME: Currently, copy propagation will not unify borrowed locals.
+            // If it does, the storage statements for `_2` should be remove
+            // so these checks will need to be updated.
+            // CHECK: StorageLive(_2);
+            // CHECK: _4 = &_3;
+            // CHECK: StorageDead(_2);
             StorageLive(_2);
             _2 = _1.0;
             _3 = _2;

tests/mir-opt/copy-prop/issue_141649.f_head_borrowed.CopyProp.diff

@@ -12,15 +12,14 @@
       bb0: {
           StorageLive(_1);
           _1 = S(const 1_u32, const 2_u32);
--         StorageLive(_2);
+          StorageLive(_2);
           _4 = &_1;
--         _2 = copy _1;
--         _3 = opaque::<S>(move _1) -> [return: bb1, unwind unreachable];
-+         _3 = opaque::<S>(copy _1) -> [return: bb1, unwind unreachable];
+          _2 = copy _1;
+          _3 = opaque::<S>(move _1) -> [return: bb1, unwind unreachable];
       }
 
       bb1: {
--         StorageDead(_2);
+          StorageDead(_2);
           StorageDead(_1);
           _5 = opaque::<&S>(move _4) -> [return: bb2, unwind unreachable];
       }

tests/mir-opt/copy-prop/issue_141649.rs

@@ -47,8 +47,11 @@ fn f_head_borrowed() {
         let _5: &S;
         {
             // CHECK: StorageLive(_1);
-            // CHECK-NOT: StorageLive(_2);
-            // CHECK: _3 = opaque::<S>(copy _1) -> [return: bb1, unwind unreachable];
+            // FIXME: Currently, copy propagation will not unify borrowed locals.
+            // If it does, the storage statements for `_2` should be remove
+            // so these checks will need to be updated.
+            // CHECK: StorageLive(_2);
+            // CHECK: _3 = opaque::<S>(move _1) -> [return: bb1, unwind unreachable];
             StorageLive(_1);
             _1 = S(1, 2);
             StorageLive(_2);
@@ -57,7 +60,7 @@ fn f_head_borrowed() {
             Call(_3 = opaque(Move(_1)), ReturnTo(bb1), UnwindUnreachable())
         }
         bb1 = {
-            // CHECK-NOT: StorageDead(_2);
+            // CHECK: StorageDead(_2);
             // CHECK: StorageDead(_1);
             StorageDead(_2);
             StorageDead(_1);

tests/mir-opt/pre-codegen/slice_filter.variant_a-{closure#0}.PreCodegen.after.mir

@@ -76,10 +76,14 @@ fn variant_a::{closure#0}(_1: &mut {closure@$DIR/slice_filter.rs:7:25: 7:39}, _2
     }
 
     bb0: {
+        StorageLive(_4);
         _3 = copy (*_2);
         _4 = &((*_3).0: usize);
+        StorageLive(_5);
         _5 = &((*_3).1: usize);
+        StorageLive(_6);
         _6 = &((*_3).2: usize);
+        StorageLive(_7);
         _7 = &((*_3).3: usize);
         StorageLive(_15);
         StorageLive(_8);
@@ -212,6 +216,10 @@ fn variant_a::{closure#0}(_1: &mut {closure@$DIR/slice_filter.rs:7:25: 7:39}, _2
     bb9: {
         StorageDead(_23);
         StorageDead(_15);
+        StorageDead(_7);
+        StorageDead(_6);
+        StorageDead(_5);
+        StorageDead(_4);
         return;
     }
 }