Bless or tweak the mir-opt tests

scottmcm · scottmcm · commit dd27a5994bc1 · 2024-07-04T13:52:10.000-07:00
diff --git a/tests/mir-opt/const_debuginfo.rs b/tests/mir-opt/const_debuginfo.rs
@@ -1,5 +1,5 @@
 //@ test-mir-pass: SingleUseConsts
-//@ compile-flags: -C overflow-checks=no -Zmir-enable-passes=+GVN
+//@ compile-flags: -C overflow-checks=no -Zmir-enable-passes=+GVN -C debuginfo=full
 
 #![allow(unused)]
 
diff --git a/tests/mir-opt/issue_76432.rs b/tests/mir-opt/issue_76432.rs
@@ -1,4 +1,5 @@
 // skip-filecheck
+//@ compile-flags: -C debuginfo=full
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 // Check that we do not insert StorageDead at each target if StorageDead was never seen
 
diff --git a/tests/mir-opt/pre-codegen/derived_ord.{impl#0}-partial_cmp.PreCodegen.after.mir b/tests/mir-opt/pre-codegen/derived_ord.{impl#0}-partial_cmp.PreCodegen.after.mir
@@ -7,7 +7,6 @@ fn <impl at $DIR/derived_ord.rs:6:10: 6:20>::partial_cmp(_1: &MultiField, _2: &M
     let mut _6: std::option::Option<std::cmp::Ordering>;
     let mut _7: i8;
     scope 1 {
-        debug cmp => _6;
     }
     scope 2 (inlined std::cmp::impls::<impl PartialOrd for char>::partial_cmp) {
         let mut _3: char;
diff --git a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-abort.diff b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-abort.diff
@@ -18,26 +18,34 @@
               debug ptr => _3;
           }
           scope 5 (inlined <std::alloc::Global as Allocator>::allocate) {
+              debug self => _9;
+              debug layout => _8;
           }
           scope 6 (inlined #[track_caller] Result::<NonNull<[u8]>, std::alloc::AllocError>::unwrap) {
+              debug self => _6;
               let mut _12: isize;
               let _13: std::alloc::AllocError;
               let mut _14: !;
               let mut _15: &dyn std::fmt::Debug;
               let mut _16: &std::alloc::AllocError;
               scope 7 {
+                  debug t => _5;
               }
               scope 8 {
+                  debug e => const std::alloc::AllocError;
               }
           }
           scope 9 (inlined NonNull::<[u8]>::as_ptr) {
+              debug self => _5;
               let mut _17: *const [u8];
           }
       }
       scope 3 (inlined #[track_caller] Option::<Layout>::unwrap) {
+          debug self => _2;
           let mut _10: isize;
           let mut _11: !;
           scope 4 {
+              debug val => _1;
           }
       }
   
diff --git a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-unwind.diff b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-unwind.diff
@@ -18,15 +18,20 @@
               debug ptr => _3;
           }
           scope 5 (inlined <std::alloc::Global as Allocator>::allocate) {
+              debug self => _9;
+              debug layout => _8;
           }
           scope 6 (inlined NonNull::<[u8]>::as_ptr) {
+              debug self => _5;
               let mut _12: *const [u8];
           }
       }
       scope 3 (inlined #[track_caller] Option::<Layout>::unwrap) {
+          debug self => _2;
           let mut _10: isize;
           let mut _11: !;
           scope 4 {
+              debug val => _1;
           }
       }
   
diff --git a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-abort.diff b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-abort.diff
@@ -18,26 +18,34 @@
               debug ptr => _3;
           }
           scope 5 (inlined <std::alloc::Global as Allocator>::allocate) {
+              debug self => _9;
+              debug layout => _8;
           }
           scope 6 (inlined #[track_caller] Result::<NonNull<[u8]>, std::alloc::AllocError>::unwrap) {
+              debug self => _6;
               let mut _12: isize;
               let _13: std::alloc::AllocError;
               let mut _14: !;
               let mut _15: &dyn std::fmt::Debug;
               let mut _16: &std::alloc::AllocError;
               scope 7 {
+                  debug t => _5;
               }
               scope 8 {
+                  debug e => const std::alloc::AllocError;
               }
           }
           scope 9 (inlined NonNull::<[u8]>::as_ptr) {
+              debug self => _5;
               let mut _17: *const [u8];
           }
       }
       scope 3 (inlined #[track_caller] Option::<Layout>::unwrap) {
+          debug self => _2;
           let mut _10: isize;
           let mut _11: !;
           scope 4 {
+              debug val => _1;
           }
       }
   
diff --git a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-unwind.diff b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-unwind.diff
@@ -18,15 +18,20 @@
               debug ptr => _3;
           }
           scope 5 (inlined <std::alloc::Global as Allocator>::allocate) {
+              debug self => _9;
+              debug layout => _8;
           }
           scope 6 (inlined NonNull::<[u8]>::as_ptr) {
+              debug self => _5;
               let mut _12: *const [u8];
           }
       }
       scope 3 (inlined #[track_caller] Option::<Layout>::unwrap) {
+          debug self => _2;
           let mut _10: isize;
           let mut _11: !;
           scope 4 {
+              debug val => _1;
           }
       }
   
diff --git a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.rs b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.rs
@@ -1,6 +1,7 @@
 // Verify that we do not ICE when printing an invalid constant.
 // EMIT_MIR_FOR_EACH_BIT_WIDTH
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
+//@ compile-flags: -C debuginfo=full
 
 #![feature(allocator_api)]
 
diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.rs b/tests/mir-opt/pre-codegen/optimizes_into_variable.rs
@@ -1,6 +1,6 @@
 // skip-filecheck
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
-//@ compile-flags: -C overflow-checks=on
+//@ compile-flags: -C overflow-checks=on -C debuginfo=2
 
 struct Point {
     x: u32,
diff --git a/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-abort.mir
@@ -12,7 +12,6 @@ fn forward_loop(_1: u32, _2: u32, _3: impl Fn(u32)) -> () {
     let _13: ();
     scope 1 {
         debug ((iter: std::ops::Range<u32>).0: u32) => _4;
-        debug ((iter: std::ops::Range<u32>).1: u32) => _2;
         let _10: u32;
         scope 2 {
             debug x => _10;
diff --git a/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-unwind.mir
@@ -12,7 +12,6 @@ fn forward_loop(_1: u32, _2: u32, _3: impl Fn(u32)) -> () {
     let _13: ();
     scope 1 {
         debug ((iter: std::ops::Range<u32>).0: u32) => _4;
-        debug ((iter: std::ops::Range<u32>).1: u32) => _2;
         let _10: u32;
         scope 2 {
             debug x => _10;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-abort.mir b/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-abort.mir
@@ -14,7 +14,6 @@ fn range_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
     let _16: ();
     scope 1 {
         debug ((iter: std::ops::Range<usize>).0: usize) => _4;
-        debug ((iter: std::ops::Range<usize>).1: usize) => _3;
         let _10: usize;
         scope 2 {
             debug i => _10;
diff --git a/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-unwind.mir b/tests/mir-opt/pre-codegen/slice_iter.range_loop.PreCodegen.after.panic-unwind.mir
@@ -14,7 +14,6 @@ fn range_loop(_1: &[T], _2: impl Fn(usize, &T)) -> () {
     let _16: ();
     scope 1 {
         debug ((iter: std::ops::Range<usize>).0: usize) => _4;
-        debug ((iter: std::ops::Range<usize>).1: usize) => _3;
         let _10: usize;
         scope 2 {
             debug i => _10;
diff --git a/tests/mir-opt/separate_const_switch.too_complex.JumpThreading.diff b/tests/mir-opt/separate_const_switch.too_complex.JumpThreading.diff
@@ -10,7 +10,6 @@
       let _5: usize;
       let mut _6: isize;
       let _7: i32;
-      let _8: usize;
       scope 1 {
           debug v => _4;
       }
@@ -21,7 +20,6 @@
           debug v => _7;
       }
       scope 4 {
-          debug r => _8;
       }
   
       bb0: {
@@ -54,10 +52,7 @@
       }
   
       bb5: {
-          StorageLive(_8);
-          _8 = ((_2 as Break).0: usize);
           _0 = const Option::<i32>::None;
-          StorageDead(_8);
           goto -> bb7;
       }
   
diff --git a/tests/mir-opt/simplify_locals.c.SimplifyLocals-before-const-prop.diff b/tests/mir-opt/simplify_locals.c.SimplifyLocals-before-const-prop.diff
@@ -3,19 +3,19 @@
   
   fn c() -> () {
       let mut _0: ();
-      let _1: [u8; 10];
+-     let _1: [u8; 10];
 -     let mut _2: &[u8];
 -     let mut _3: &[u8; 10];
 -     let _4: &[u8; 10];
       scope 1 {
-          debug bytes => _1;
+-         debug bytes => _1;
           scope 2 {
           }
       }
   
       bb0: {
-          StorageLive(_1);
-          _1 = [const 0_u8; 10];
+-         StorageLive(_1);
+-         _1 = [const 0_u8; 10];
 -         StorageLive(_2);
 -         StorageLive(_3);
 -         StorageLive(_4);
@@ -26,7 +26,7 @@
 -         StorageDead(_4);
 -         StorageDead(_2);
           _0 = const ();
-          StorageDead(_1);
+-         StorageDead(_1);
           return;
       }
   }
diff --git a/tests/mir-opt/simplify_locals.r.SimplifyLocals-before-const-prop.diff b/tests/mir-opt/simplify_locals.r.SimplifyLocals-before-const-prop.diff
@@ -3,28 +3,28 @@
   
   fn r() -> () {
       let mut _0: ();
-      let mut _1: i32;
+-     let mut _1: i32;
 -     let mut _2: &i32;
 -     let mut _3: &mut i32;
       scope 1 {
-          debug a => _1;
+-         debug a => _1;
           scope 2 {
               scope 3 {
               }
           }
       }
   
       bb0: {
-          StorageLive(_1);
-          _1 = const 1_i32;
+-         StorageLive(_1);
+-         _1 = const 1_i32;
 -         StorageLive(_2);
 -         _2 = &_1;
 -         StorageDead(_2);
 -         StorageLive(_3);
 -         _3 = &mut _1;
 -         StorageDead(_3);
           _0 = const ();
-          StorageDead(_1);
+-         StorageDead(_1);
           return;
       }
   }
diff --git a/tests/mir-opt/simplify_locals_fixedpoint.foo.SimplifyLocals-final.panic-abort.diff b/tests/mir-opt/simplify_locals_fixedpoint.foo.SimplifyLocals-final.panic-abort.diff
@@ -9,8 +9,6 @@
       let mut _4: isize;
       let mut _5: isize;
       scope 1 {
-          debug a => _6;
-          let _6: u8;
       }
   
       bb0: {
@@ -23,31 +21,24 @@
           StorageDead(_3);
           StorageDead(_2);
           _5 = discriminant((_1.0: std::option::Option<u8>));
-          switchInt(move _5) -> [1: bb1, 0: bb3, otherwise: bb5];
+          switchInt(move _5) -> [1: bb1, 0: bb2, otherwise: bb4];
       }
   
       bb1: {
           _4 = discriminant((_1.1: std::option::Option<T>));
-          switchInt(move _4) -> [0: bb2, 1: bb3, otherwise: bb5];
+          switchInt(move _4) -> [0: bb2, 1: bb2, otherwise: bb4];
       }
   
       bb2: {
-          StorageLive(_6);
-          _6 = (((_1.0: std::option::Option<u8>) as Some).0: u8);
-          StorageDead(_6);
-          goto -> bb3;
+          drop(_1) -> [return: bb3, unwind unreachable];
       }
   
       bb3: {
-          drop(_1) -> [return: bb4, unwind unreachable];
-      }
-  
-      bb4: {
           StorageDead(_1);
           return;
       }
   
-      bb5: {
+      bb4: {
           unreachable;
       }
   }
diff --git a/tests/mir-opt/simplify_locals_fixedpoint.foo.SimplifyLocals-final.panic-unwind.diff b/tests/mir-opt/simplify_locals_fixedpoint.foo.SimplifyLocals-final.panic-unwind.diff
@@ -9,8 +9,6 @@
       let mut _4: isize;
       let mut _5: isize;
       scope 1 {
-          debug a => _6;
-          let _6: u8;
       }
   
       bb0: {
@@ -23,31 +21,24 @@
           StorageDead(_3);
           StorageDead(_2);
           _5 = discriminant((_1.0: std::option::Option<u8>));
-          switchInt(move _5) -> [1: bb1, 0: bb3, otherwise: bb5];
+          switchInt(move _5) -> [1: bb1, 0: bb2, otherwise: bb4];
       }
   
       bb1: {
           _4 = discriminant((_1.1: std::option::Option<T>));
-          switchInt(move _4) -> [0: bb2, 1: bb3, otherwise: bb5];
+          switchInt(move _4) -> [0: bb2, 1: bb2, otherwise: bb4];
       }
   
       bb2: {
-          StorageLive(_6);
-          _6 = (((_1.0: std::option::Option<u8>) as Some).0: u8);
-          StorageDead(_6);
-          goto -> bb3;
+          drop(_1) -> [return: bb3, unwind continue];
       }
   
       bb3: {
-          drop(_1) -> [return: bb4, unwind continue];
-      }
-  
-      bb4: {
           StorageDead(_1);
           return;
       }
   
-      bb5: {
+      bb4: {
           unreachable;
       }
   }
diff --git a/tests/mir-opt/uninhabited_enum.process_never.SimplifyLocals-final.after.mir b/tests/mir-opt/uninhabited_enum.process_never.SimplifyLocals-final.after.mir
@@ -3,9 +3,7 @@
 fn process_never(_1: *const !) -> () {
     debug input => _1;
     let mut _0: ();
-    let _2: &!;
     scope 1 {
-        debug _input => _2;
     }
 
     bb0: {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// skip-filecheck`
	`2`	`+//@ compile-flags: -C debuginfo=full`
`2`	`3`	`// EMIT_MIR_FOR_EACH_PANIC_STRATEGY`
`3`	`4`	`// Check that we do not insert StorageDead at each target if StorageDead was never seen`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ fn <impl at $DIR/derived_ord.rs:6:10: 6:20>::partial_cmp(_1: &MultiField, _2: &M`
`7`	`7`	`let mut _6: std::option::Option<std::cmp::Ordering>;`
`8`	`8`	`let mut _7: i8;`
`9`	`9`	`scope 1 {`
`10`		`- debug cmp => _6;`
`11`	`10`	`}`
`12`	`11`	`scope 2 (inlined std::cmp::impls::<impl PartialOrd for char>::partial_cmp) {`
`13`	`12`	`let mut _3: char;`
Original file line number	Diff line number	Diff line change
`@@ -18,26 +18,34 @@`
`18`	`18`	`debug ptr => _3;`
`19`	`19`	`}`
`20`	`20`	`scope 5 (inlined <std::alloc::Global as Allocator>::allocate) {`
	`21`	`+ debug self => _9;`
	`22`	`+ debug layout => _8;`
`21`	`23`	`}`
`22`	`24`	`scope 6 (inlined #[track_caller] Result::<NonNull<[u8]>, std::alloc::AllocError>::unwrap) {`
	`25`	`+ debug self => _6;`
`23`	`26`	`let mut _12: isize;`
`24`	`27`	`let _13: std::alloc::AllocError;`
`25`	`28`	`let mut _14: !;`
`26`	`29`	`let mut _15: &dyn std::fmt::Debug;`
`27`	`30`	`let mut _16: &std::alloc::AllocError;`
`28`	`31`	`scope 7 {`
	`32`	`+ debug t => _5;`
`29`	`33`	`}`
`30`	`34`	`scope 8 {`
	`35`	`+ debug e => const std::alloc::AllocError;`
`31`	`36`	`}`
`32`	`37`	`}`
`33`	`38`	`scope 9 (inlined NonNull::<[u8]>::as_ptr) {`
	`39`	`+ debug self => _5;`
`34`	`40`	`let mut _17: *const [u8];`
`35`	`41`	`}`
`36`	`42`	`}`
`37`	`43`	`scope 3 (inlined #[track_caller] Option::<Layout>::unwrap) {`
	`44`	`+ debug self => _2;`
`38`	`45`	`let mut _10: isize;`
`39`	`46`	`let mut _11: !;`
`40`	`47`	`scope 4 {`
	`48`	`+ debug val => _1;`
`41`	`49`	`}`
`42`	`50`	`}`
`43`	`51`
Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,20 @@`
`18`	`18`	`debug ptr => _3;`
`19`	`19`	`}`
`20`	`20`	`scope 5 (inlined <std::alloc::Global as Allocator>::allocate) {`
	`21`	`+ debug self => _9;`
	`22`	`+ debug layout => _8;`
`21`	`23`	`}`
`22`	`24`	`scope 6 (inlined NonNull::<[u8]>::as_ptr) {`
	`25`	`+ debug self => _5;`
`23`	`26`	`let mut _12: *const [u8];`
`24`	`27`	`}`
`25`	`28`	`}`
`26`	`29`	`scope 3 (inlined #[track_caller] Option::<Layout>::unwrap) {`
	`30`	`+ debug self => _2;`
`27`	`31`	`let mut _10: isize;`
`28`	`32`	`let mut _11: !;`
`29`	`33`	`scope 4 {`
	`34`	`+ debug val => _1;`
`30`	`35`	`}`
`31`	`36`	`}`
`32`	`37`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`let _5: usize;`
`11`	`11`	`let mut _6: isize;`
`12`	`12`	`let _7: i32;`
`13`		`- let _8: usize;`
`14`	`13`	`scope 1 {`
`15`	`14`	`debug v => _4;`
`16`	`15`	`}`
`@@ -21,7 +20,6 @@`
`21`	`20`	`debug v => _7;`
`22`	`21`	`}`
`23`	`22`	`scope 4 {`
`24`		`- debug r => _8;`
`25`	`23`	`}`
`26`	`24`
`27`	`25`	`bb0: {`
`@@ -54,10 +52,7 @@`
`54`	`52`	`}`
`55`	`53`
`56`	`54`	`bb5: {`
`57`		`- StorageLive(_8);`
`58`		`- _8 = ((_2 as Break).0: usize);`
`59`	`55`	`_0 = const Option::<i32>::None;`
`60`		`- StorageDead(_8);`
`61`	`56`	`goto -> bb7;`
`62`	`57`	`}`
`63`	`58`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@`
`9`	`9`	`let mut _4: isize;`
`10`	`10`	`let mut _5: isize;`
`11`	`11`	`scope 1 {`
`12`		`- debug a => _6;`
`13`		`- let _6: u8;`
`14`	`12`	`}`
`15`	`13`
`16`	`14`	`bb0: {`
`@@ -23,31 +21,24 @@`
`23`	`21`	`StorageDead(_3);`
`24`	`22`	`StorageDead(_2);`
`25`	`23`	`_5 = discriminant((_1.0: std::option::Option<u8>));`
`26`		`- switchInt(move _5) -> [1: bb1, 0: bb3, otherwise: bb5];`
	`24`	`+ switchInt(move _5) -> [1: bb1, 0: bb2, otherwise: bb4];`
`27`	`25`	`}`
`28`	`26`
`29`	`27`	`bb1: {`
`30`	`28`	`_4 = discriminant((_1.1: std::option::Option<T>));`
`31`		`- switchInt(move _4) -> [0: bb2, 1: bb3, otherwise: bb5];`
	`29`	`+ switchInt(move _4) -> [0: bb2, 1: bb2, otherwise: bb4];`
`32`	`30`	`}`
`33`	`31`
`34`	`32`	`bb2: {`
`35`		`- StorageLive(_6);`
`36`		`- _6 = (((_1.0: std::option::Option<u8>) as Some).0: u8);`
`37`		`- StorageDead(_6);`
`38`		`- goto -> bb3;`
	`33`	`+ drop(_1) -> [return: bb3, unwind unreachable];`
`39`	`34`	`}`
`40`	`35`
`41`	`36`	`bb3: {`
`42`		`- drop(_1) -> [return: bb4, unwind unreachable];`
`43`		`- }`
`44`		`-`
`45`		`- bb4: {`
`46`	`37`	`StorageDead(_1);`
`47`	`38`	`return;`
`48`	`39`	`}`
`49`	`40`
`50`		`- bb5: {`
	`41`	`+ bb4: {`
`51`	`42`	`unreachable;`
`52`	`43`	`}`
`53`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,7 @@`
`3`	`3`	`fn process_never(_1: *const !) -> () {`
`4`	`4`	`debug input => _1;`
`5`	`5`	`let mut _0: ();`
`6`		`- let _2: &!;`
`7`	`6`	`scope 1 {`
`8`		`- debug _input => _2;`
`9`	`7`	`}`
`10`	`8`
`11`	`9`	`bb0: {`