fixup! mir-opt: Eliminate dead ref statements

dianqk · dianqk · commit 06f5ac853c2f · 2025-08-06T17:40:02.000+08:00
Add a semicolon.
diff --git a/compiler/rustc_middle/src/mir/pretty.rs b/compiler/rustc_middle/src/mir/pretty.rs
@@ -779,7 +779,7 @@ where
     for statement in &data.statements {
         extra_data(PassWhere::BeforeLocation(current_location), w)?;
         for debuginfo in statement.debuginfos.iter() {
-            writeln!(w, "{INDENT}{INDENT}// DBG: {debuginfo:?}")?;
+            writeln!(w, "{INDENT}{INDENT}// DBG: {debuginfo:?};")?;
         }
         let indented_body = format!("{INDENT}{INDENT}{statement:?};");
         if options.include_extra_comments {
@@ -816,7 +816,7 @@ where
     // Terminator at the bottom.
     extra_data(PassWhere::BeforeLocation(current_location), w)?;
     for debuginfo in data.after_last_stmt_debuginfos.iter() {
-        writeln!(w, "{INDENT}{INDENT}// DBG: {debuginfo:?}")?;
+        writeln!(w, "{INDENT}{INDENT}// DBG: {debuginfo:?};")?;
     }
     if data.terminator.is_some() {
         let indented_terminator = format!("{0}{0}{1:?};", INDENT, data.terminator().kind);
diff --git a/tests/mir-opt/dead-store-elimination/ref.dead_first.DeadStoreElimination-initial.diff b/tests/mir-opt/dead-store-elimination/ref.dead_first.DeadStoreElimination-initial.diff
@@ -14,7 +14,7 @@
       bb0: {
           StorageLive(_2);
 -         _2 = &((*_1).2: i32);
-+         // DBG: _2 = &((*_1).2: i32)
++         // DBG: _2 = &((*_1).2: i32);
           StorageLive(_3);
           StorageLive(_4);
           _4 = &((*_1).0: i32);
diff --git a/tests/mir-opt/dead-store-elimination/ref.tuple.DeadStoreElimination-initial.diff b/tests/mir-opt/dead-store-elimination/ref.tuple.DeadStoreElimination-initial.diff
@@ -15,7 +15,7 @@
 -         StorageLive(_2);
 -         _3 = deref_copy (_1.1: &Foo);
 -         _2 = &((*_3).2: i32);
-+         // DBG: _2 = &((*_3).2: i32)
++         // DBG: _2 = &((*_3).2: i32);
           _4 = deref_copy (_1.1: &Foo);
           _0 = copy ((*_4).0: i32);
 -         StorageDead(_2);
diff --git a/tests/mir-opt/debuginfo/simplifycfg.drop_debuginfo.SimplifyCfg-final.diff b/tests/mir-opt/debuginfo/simplifycfg.drop_debuginfo.SimplifyCfg-final.diff
@@ -13,12 +13,12 @@
 -     }
 - 
 -     bb1: {
--         // DBG: _3 = &((*_1).0: i32)
+-         // DBG: _3 = &((*_1).0: i32);
 -         goto -> bb2;
 -     }
 - 
 -     bb2: {
-          // DBG: _4 = &((*_1).1: i64)
+          // DBG: _4 = &((*_1).1: i64);
           _0 = copy ((*_1).2: i32);
           return;
       }
diff --git a/tests/mir-opt/debuginfo/simplifycfg.preserve_debuginfo_1.SimplifyCfg-final.diff b/tests/mir-opt/debuginfo/simplifycfg.preserve_debuginfo_1.SimplifyCfg-final.diff
@@ -16,14 +16,14 @@
 - 
 -     bb1: {
           (*_2) = const true;
-          // DBG: _3 = &((*_1).0: i32)
+          // DBG: _3 = &((*_1).0: i32);
 -         goto -> bb2;
 -     }
 - 
 -     bb2: {
-          // DBG: _4 = &((*_1).1: i64)
+          // DBG: _4 = &((*_1).1: i64);
           _0 = copy ((*_1).2: i32);
-          // DBG: _5 = &((*_1).2: i32)
+          // DBG: _5 = &((*_1).2: i32);
           return;
       }
   }
diff --git a/tests/mir-opt/debuginfo/simplifycfg.preserve_debuginfo_2.SimplifyCfg-final.diff b/tests/mir-opt/debuginfo/simplifycfg.preserve_debuginfo_2.SimplifyCfg-final.diff
@@ -15,14 +15,14 @@
 -     }
 - 
 -     bb1: {
-          // DBG: _2 = &((*_1).0: i32)
+          // DBG: _2 = &((*_1).0: i32);
 -         goto -> bb2;
 -     }
 - 
 -     bb2: {
-          // DBG: _3 = &((*_1).1: i64)
+          // DBG: _3 = &((*_1).1: i64);
           _0 = copy ((*_1).2: i32);
-          // DBG: _4 = &((*_1).2: i32)
+          // DBG: _4 = &((*_1).2: i32);
           return;
       }
   }
diff --git a/tests/mir-opt/issue_76432.test.SimplifyComparisonIntegral.panic-abort.diff b/tests/mir-opt/issue_76432.test.SimplifyComparisonIntegral.panic-abort.diff
@@ -37,9 +37,9 @@
       }
   
       bb2: {
-          // DBG: _7 = &(*_2)[0 of 3]
-          // DBG: _8 = &(*_2)[1 of 3]
-          // DBG: _9 = &(*_2)[2 of 3]
+          // DBG: _7 = &(*_2)[0 of 3];
+          // DBG: _8 = &(*_2)[1 of 3];
+          // DBG: _9 = &(*_2)[2 of 3];
           StorageDead(_4);
           return;
       }
diff --git a/tests/mir-opt/issue_76432.test.SimplifyComparisonIntegral.panic-unwind.diff b/tests/mir-opt/issue_76432.test.SimplifyComparisonIntegral.panic-unwind.diff
@@ -37,9 +37,9 @@
       }
   
       bb2: {
-          // DBG: _7 = &(*_2)[0 of 3]
-          // DBG: _8 = &(*_2)[1 of 3]
-          // DBG: _9 = &(*_2)[2 of 3]
+          // DBG: _7 = &(*_2)[0 of 3];
+          // DBG: _8 = &(*_2)[1 of 3];
+          // DBG: _9 = &(*_2)[2 of 3];
           StorageDead(_4);
           return;
       }
diff --git a/tests/mir-opt/pre-codegen/clone_as_copy.{impl#1}-clone.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/clone_as_copy.{impl#1}-clone.PreCodegen.after.mir
@@ -9,7 +9,7 @@ fn <impl at $DIR/clone_as_copy.rs:12:10: 12:15>::clone(_1: &NestCopy) -> NestCop
     }
 
     bb0: {
-        // DBG: _2 = &((*_1).1: AllCopy)
+        // DBG: _2 = &((*_1).1: AllCopy);
         _0 = copy (*_1);
         return;
     }
diff --git a/tests/mir-opt/pre-codegen/loops.filter_mapped.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/loops.filter_mapped.PreCodegen.after.mir
@@ -38,7 +38,7 @@ fn filter_mapped(_1: impl Iterator<Item = T>, _2: impl Fn(T) -> Option<U>) -> ()
 
     bb2: {
         StorageLive(_7);
-        // DBG: _11 = &_4
+        // DBG: _11 = &_4;
         StorageLive(_5);
         _5 = &mut (_4.0: impl Iterator<Item = T>);
         StorageLive(_6);
diff --git a/tests/mir-opt/pre-codegen/loops.int_range.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/loops.int_range.PreCodegen.after.mir
@@ -61,10 +61,10 @@ fn int_range(_1: usize, _2: usize) -> () {
 
     bb1: {
         StorageLive(_10);
-        // DBG: _13 = &_4
+        // DBG: _13 = &_4;
         StorageLive(_7);
-        // DBG: _14 = &(_4.0: usize)
-        // DBG: _15 = &(_4.1: usize)
+        // DBG: _14 = &(_4.0: usize);
+        // DBG: _15 = &(_4.1: usize);
         StorageLive(_5);
         _5 = copy (_4.0: usize);
         StorageLive(_6);
diff --git a/tests/mir-opt/pre-codegen/loops.mapped.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/loops.mapped.PreCodegen.after.mir
@@ -53,7 +53,7 @@ fn mapped(_1: impl Iterator<Item = T>, _2: impl Fn(T) -> U) -> () {
 
     bb2: {
         StorageLive(_12);
-        // DBG: _15 = &_4
+        // DBG: _15 = &_4;
         StorageLive(_7);
         StorageLive(_6);
         StorageLive(_5);
diff --git a/tests/mir-opt/pre-codegen/slice_filter.variant_a-{closure#0}.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/slice_filter.variant_a-{closure#0}.PreCodegen.after.mir
@@ -65,13 +65,13 @@ fn variant_a::{closure#0}(_1: &mut {closure@$DIR/slice_filter.rs:7:25: 7:39}, _2
 
     bb0: {
         _3 = copy (*_2);
-        // DBG: _13 = &((*_3).0: usize)
-        // DBG: _14 = &((*_3).1: usize)
-        // DBG: _15 = &((*_3).2: usize)
-        // DBG: _16 = &((*_3).3: usize)
+        // DBG: _13 = &((*_3).0: usize);
+        // DBG: _14 = &((*_3).1: usize);
+        // DBG: _15 = &((*_3).2: usize);
+        // DBG: _16 = &((*_3).3: usize);
         StorageLive(_6);
-        // DBG: _17 = &_13
-        // DBG: _18 = &?
+        // DBG: _17 = &_13;
+        // DBG: _18 = &?;
         _4 = copy ((*_3).0: usize);
         _5 = copy ((*_3).2: usize);
         _6 = Le(copy _4, copy _5);
@@ -80,8 +80,8 @@ fn variant_a::{closure#0}(_1: &mut {closure@$DIR/slice_filter.rs:7:25: 7:39}, _2
 
     bb1: {
         StorageLive(_9);
-        // DBG: _19 = &_16
-        // DBG: _20 = &?
+        // DBG: _19 = &_16;
+        // DBG: _20 = &?;
         StorageLive(_7);
         _7 = copy ((*_3).3: usize);
         StorageLive(_8);
@@ -94,8 +94,8 @@ fn variant_a::{closure#0}(_1: &mut {closure@$DIR/slice_filter.rs:7:25: 7:39}, _2
 
     bb2: {
         StorageLive(_10);
-        // DBG: _21 = &_15
-        // DBG: _22 = &?
+        // DBG: _21 = &_15;
+        // DBG: _22 = &?;
         _10 = Le(copy _5, copy _4);
         switchInt(move _10) -> [0: bb3, otherwise: bb4];
     }
@@ -106,8 +106,8 @@ fn variant_a::{closure#0}(_1: &mut {closure@$DIR/slice_filter.rs:7:25: 7:39}, _2
     }
 
     bb4: {
-        // DBG: _23 = &_14
-        // DBG: _24 = &?
+        // DBG: _23 = &_14;
+        // DBG: _24 = &?;
         StorageLive(_11);
         _11 = copy ((*_3).1: usize);
         StorageLive(_12);
diff --git a/tests/mir-opt/pre-codegen/spans.outer.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/spans.outer.PreCodegen.after.panic-abort.mir
@@ -9,7 +9,7 @@ fn outer(_1: u8) -> u8 {
     }
 
     bb0: {
-        // DBG: _2 = &_1
+        // DBG: _2 = &_1;
         _0 = copy _1;                    // scope 1 at $DIR/spans.rs:15:5: 15:7
         return;                          // scope 0 at $DIR/spans.rs:12:2: 12:2
     }
diff --git a/tests/mir-opt/pre-codegen/spans.outer.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/spans.outer.PreCodegen.after.panic-unwind.mir
@@ -9,7 +9,7 @@ fn outer(_1: u8) -> u8 {
     }
 
     bb0: {
-        // DBG: _2 = &_1
+        // DBG: _2 = &_1;
         _0 = copy _1;                    // scope 1 at $DIR/spans.rs:15:5: 15:7
         return;                          // scope 0 at $DIR/spans.rs:12:2: 12:2
     }

Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@`
`13`	`13`	`- }`
`14`	`14`	`-`
`15`	`15`	`- bb1: {`
`16`		`-- // DBG: _3 = &((*_1).0: i32)`
	`16`	`+- // DBG: _3 = &((*_1).0: i32);`
`17`	`17`	`- goto -> bb2;`
`18`	`18`	`- }`
`19`	`19`	`-`
`20`	`20`	`- bb2: {`
`21`		`- // DBG: _4 = &((*_1).1: i64)`
	`21`	`+ // DBG: _4 = &((*_1).1: i64);`
`22`	`22`	`_0 = copy ((*_1).2: i32);`
`23`	`23`	`return;`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@`
`16`	`16`	`-`
`17`	`17`	`- bb1: {`
`18`	`18`	`(*_2) = const true;`
`19`		`- // DBG: _3 = &((*_1).0: i32)`
	`19`	`+ // DBG: _3 = &((*_1).0: i32);`
`20`	`20`	`- goto -> bb2;`
`21`	`21`	`- }`
`22`	`22`	`-`
`23`	`23`	`- bb2: {`
`24`		`- // DBG: _4 = &((*_1).1: i64)`
	`24`	`+ // DBG: _4 = &((*_1).1: i64);`
`25`	`25`	`_0 = copy ((*_1).2: i32);`
`26`		`- // DBG: _5 = &((*_1).2: i32)`
	`26`	`+ // DBG: _5 = &((*_1).2: i32);`
`27`	`27`	`return;`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,14 @@`
`15`	`15`	`- }`
`16`	`16`	`-`
`17`	`17`	`- bb1: {`
`18`		`- // DBG: _2 = &((*_1).0: i32)`
	`18`	`+ // DBG: _2 = &((*_1).0: i32);`
`19`	`19`	`- goto -> bb2;`
`20`	`20`	`- }`
`21`	`21`	`-`
`22`	`22`	`- bb2: {`
`23`		`- // DBG: _3 = &((*_1).1: i64)`
	`23`	`+ // DBG: _3 = &((*_1).1: i64);`
`24`	`24`	`_0 = copy ((*_1).2: i32);`
`25`		`- // DBG: _4 = &((*_1).2: i32)`
	`25`	`+ // DBG: _4 = &((*_1).2: i32);`
`26`	`26`	`return;`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,9 @@`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`bb2: {`
`40`		`- // DBG: _7 = &(*_2)[0 of 3]`
`41`		`- // DBG: _8 = &(*_2)[1 of 3]`
`42`		`- // DBG: _9 = &(*_2)[2 of 3]`
	`40`	`+ // DBG: _7 = &(*_2)[0 of 3];`
	`41`	`+ // DBG: _8 = &(*_2)[1 of 3];`
	`42`	`+ // DBG: _9 = &(*_2)[2 of 3];`
`43`	`43`	`StorageDead(_4);`
`44`	`44`	`return;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ fn <impl at $DIR/clone_as_copy.rs:12:10: 12:15>::clone(_1: &NestCopy) -> NestCop`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`bb0: {`
`12`		`- // DBG: _2 = &((*_1).1: AllCopy)`
	`12`	`+ // DBG: _2 = &((*_1).1: AllCopy);`
`13`	`13`	`_0 = copy (*_1);`
`14`	`14`	`return;`
`15`	`15`	`}`