Auto merge of #97570 - JakobDegen:dse-test, r=tmiasko

Fix TLS access mir opt test and remove stale files

Thanks `@pietroalbini` for noticing that the TLS test was not doing what it was supposed to. Switched to `PreCodegen` because `SimplifyCfg` does not run on opt level 0.

Also addresses the easy part of #97564 .

r? rust-lang/mir-opt

7 files changed, 21 insertions, 326 deletions

diff --git a/src/test/mir-opt/inst_combine_deref.deep_opt.InstCombine.diff b/src/test/mir-opt/inst_combine_deref.deep_opt.InstCombine.diff
deleted file mode 100644
index 1d20e17a849..00000000000
--- a/src/test/mir-opt/inst_combine_deref.deep_opt.InstCombine.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-- // MIR for `deep_opt` before InstCombine
-+ // MIR for `deep_opt` after InstCombine
-  
-  fn deep_opt() -> (u64, u64, u64) {
-      let mut _0: (u64, u64, u64);         // return place in scope 0 at $DIR/inst_combine_deref.rs:11:18: 11:33
-      let _1: u64;                         // in scope 0 at $DIR/inst_combine_deref.rs:12:9: 12:11
-      let mut _10: u64;                    // in scope 0 at $DIR/inst_combine_deref.rs:21:6: 21:8
-      let mut _11: u64;                    // in scope 0 at $DIR/inst_combine_deref.rs:21:10: 21:12
-      let mut _12: u64;                    // in scope 0 at $DIR/inst_combine_deref.rs:21:14: 21:16
-      scope 1 {
-          debug x1 => _1;                  // in scope 1 at $DIR/inst_combine_deref.rs:12:9: 12:11
-          let _2: u64;                     // in scope 1 at $DIR/inst_combine_deref.rs:13:9: 13:11
-          scope 2 {
-              debug x2 => _2;              // in scope 2 at $DIR/inst_combine_deref.rs:13:9: 13:11
-              let _3: u64;                 // in scope 2 at $DIR/inst_combine_deref.rs:14:9: 14:11
-              scope 3 {
-                  debug x3 => _3;          // in scope 3 at $DIR/inst_combine_deref.rs:14:9: 14:11
-                  let _4: &u64;            // in scope 3 at $DIR/inst_combine_deref.rs:15:9: 15:11
-                  scope 4 {
-                      debug y1 => _4;      // in scope 4 at $DIR/inst_combine_deref.rs:15:9: 15:11
-                      let _5: &u64;        // in scope 4 at $DIR/inst_combine_deref.rs:16:9: 16:11
-                      scope 5 {
-                          debug y2 => _5;  // in scope 5 at $DIR/inst_combine_deref.rs:16:9: 16:11
-                          let _6: &u64;    // in scope 5 at $DIR/inst_combine_deref.rs:17:9: 17:11
-                          scope 6 {
-                              debug y3 => _6; // in scope 6 at $DIR/inst_combine_deref.rs:17:9: 17:11
-                              let _7: u64; // in scope 6 at $DIR/inst_combine_deref.rs:18:9: 18:11
-                              scope 7 {
-                                  debug z1 => _7; // in scope 7 at $DIR/inst_combine_deref.rs:18:9: 18:11
-                                  let _8: u64; // in scope 7 at $DIR/inst_combine_deref.rs:19:9: 19:11
-                                  scope 8 {
-                                      debug z2 => _8; // in scope 8 at $DIR/inst_combine_deref.rs:19:9: 19:11
-                                      let _9: u64; // in scope 8 at $DIR/inst_combine_deref.rs:20:9: 20:11
-                                      scope 9 {
-                                          debug z3 => _9; // in scope 9 at $DIR/inst_combine_deref.rs:20:9: 20:11
-                                      }
-                                  }
-                              }
-                          }
-                      }
-                  }
-              }
-          }
-      }
-  
-      bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/inst_combine_deref.rs:12:9: 12:11
-          _1 = const 1_u64;                // scope 0 at $DIR/inst_combine_deref.rs:12:14: 12:15
-          StorageLive(_2);                 // scope 1 at $DIR/inst_combine_deref.rs:13:9: 13:11
-          _2 = const 2_u64;                // scope 1 at $DIR/inst_combine_deref.rs:13:14: 13:15
-          StorageLive(_3);                 // scope 2 at $DIR/inst_combine_deref.rs:14:9: 14:11
-          _3 = const 3_u64;                // scope 2 at $DIR/inst_combine_deref.rs:14:14: 14:15
-          StorageLive(_4);                 // scope 3 at $DIR/inst_combine_deref.rs:15:9: 15:11
-          _4 = &_1;                        // scope 3 at $DIR/inst_combine_deref.rs:15:14: 15:17
-          StorageLive(_5);                 // scope 4 at $DIR/inst_combine_deref.rs:16:9: 16:11
-          _5 = &_2;                        // scope 4 at $DIR/inst_combine_deref.rs:16:14: 16:17
-          StorageLive(_6);                 // scope 5 at $DIR/inst_combine_deref.rs:17:9: 17:11
-          _6 = &_3;                        // scope 5 at $DIR/inst_combine_deref.rs:17:14: 17:17
-          StorageLive(_7);                 // scope 6 at $DIR/inst_combine_deref.rs:18:9: 18:11
--         _7 = (*_4);                      // scope 6 at $DIR/inst_combine_deref.rs:18:14: 18:17
-+         _7 = _1;                         // scope 6 at $DIR/inst_combine_deref.rs:18:14: 18:17
-          StorageLive(_8);                 // scope 7 at $DIR/inst_combine_deref.rs:19:9: 19:11
--         _8 = (*_5);                      // scope 7 at $DIR/inst_combine_deref.rs:19:14: 19:17
-+         _8 = _2;                         // scope 7 at $DIR/inst_combine_deref.rs:19:14: 19:17
-          StorageLive(_9);                 // scope 8 at $DIR/inst_combine_deref.rs:20:9: 20:11
--         _9 = (*_6);                      // scope 8 at $DIR/inst_combine_deref.rs:20:14: 20:17
-+         _9 = _3;                         // scope 8 at $DIR/inst_combine_deref.rs:20:14: 20:17
-          StorageLive(_10);                // scope 9 at $DIR/inst_combine_deref.rs:21:6: 21:8
-          _10 = _7;                        // scope 9 at $DIR/inst_combine_deref.rs:21:6: 21:8
-          StorageLive(_11);                // scope 9 at $DIR/inst_combine_deref.rs:21:10: 21:12
-          _11 = _8;                        // scope 9 at $DIR/inst_combine_deref.rs:21:10: 21:12
-          StorageLive(_12);                // scope 9 at $DIR/inst_combine_deref.rs:21:14: 21:16
-          _12 = _9;                        // scope 9 at $DIR/inst_combine_deref.rs:21:14: 21:16
-          (_0.0: u64) = move _10;          // scope 9 at $DIR/inst_combine_deref.rs:21:5: 21:17
-          (_0.1: u64) = move _11;          // scope 9 at $DIR/inst_combine_deref.rs:21:5: 21:17
-          (_0.2: u64) = move _12;          // scope 9 at $DIR/inst_combine_deref.rs:21:5: 21:17
-          StorageDead(_12);                // scope 9 at $DIR/inst_combine_deref.rs:21:16: 21:17
-          StorageDead(_11);                // scope 9 at $DIR/inst_combine_deref.rs:21:16: 21:17
-          StorageDead(_10);                // scope 9 at $DIR/inst_combine_deref.rs:21:16: 21:17
-          StorageDead(_9);                 // scope 8 at $DIR/inst_combine_deref.rs:22:1: 22:2
-          StorageDead(_8);                 // scope 7 at $DIR/inst_combine_deref.rs:22:1: 22:2
-          StorageDead(_7);                 // scope 6 at $DIR/inst_combine_deref.rs:22:1: 22:2
-          StorageDead(_6);                 // scope 5 at $DIR/inst_combine_deref.rs:22:1: 22:2
-          StorageDead(_5);                 // scope 4 at $DIR/inst_combine_deref.rs:22:1: 22:2
-          StorageDead(_4);                 // scope 3 at $DIR/inst_combine_deref.rs:22:1: 22:2
-          StorageDead(_3);                 // scope 2 at $DIR/inst_combine_deref.rs:22:1: 22:2
-          StorageDead(_2);                 // scope 1 at $DIR/inst_combine_deref.rs:22:1: 22:2
-          StorageDead(_1);                 // scope 0 at $DIR/inst_combine_deref.rs:22:1: 22:2
-          return;                          // scope 0 at $DIR/inst_combine_deref.rs:22:2: 22:2
-      }
-  }
-  
diff --git a/src/test/mir-opt/inst_combine_deref.do_not_miscompile.InstCombine.diff b/src/test/mir-opt/inst_combine_deref.do_not_miscompile.InstCombine.diff
deleted file mode 100644
index ee8fcdcde40..00000000000
--- a/src/test/mir-opt/inst_combine_deref.do_not_miscompile.InstCombine.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-- // MIR for `do_not_miscompile` before InstCombine
-+ // MIR for `do_not_miscompile` after InstCombine
-  
-  fn do_not_miscompile() -> () {
-      let mut _0: ();                      // return place in scope 0 at $DIR/inst_combine_deref.rs:54:24: 54:24
-      let _1: i32;                         // in scope 0 at $DIR/inst_combine_deref.rs:55:9: 55:10
-      let mut _5: &i32;                    // in scope 0 at $DIR/inst_combine_deref.rs:59:10: 59:12
-      let _6: &i32;                        // in scope 0 at $DIR/inst_combine_deref.rs:59:10: 59:12
-      let _7: ();                          // in scope 0 at $DIR/inst_combine_deref.rs:60:5: 60:23
-      let mut _8: bool;                    // in scope 0 at $DIR/inst_combine_deref.rs:60:5: 60:23
-      let mut _9: bool;                    // in scope 0 at $DIR/inst_combine_deref.rs:60:13: 60:21
-      let mut _10: i32;                    // in scope 0 at $DIR/inst_combine_deref.rs:60:13: 60:15
-      let mut _11: !;                      // in scope 0 at $DIR/inst_combine_deref.rs:60:5: 60:23
-      scope 1 {
-          debug x => _1;                   // in scope 1 at $DIR/inst_combine_deref.rs:55:9: 55:10
-          let _2: i32;                     // in scope 1 at $DIR/inst_combine_deref.rs:56:9: 56:10
-          scope 2 {
-              debug a => _2;               // in scope 2 at $DIR/inst_combine_deref.rs:56:9: 56:10
-              let mut _3: &i32;            // in scope 2 at $DIR/inst_combine_deref.rs:57:9: 57:14
-              scope 3 {
-                  debug y => _3;           // in scope 3 at $DIR/inst_combine_deref.rs:57:9: 57:14
-                  let _4: &mut &i32;       // in scope 3 at $DIR/inst_combine_deref.rs:58:9: 58:10
-                  scope 4 {
-                      debug z => _4;       // in scope 4 at $DIR/inst_combine_deref.rs:58:9: 58:10
-                  }
-              }
-          }
-      }
-  
-      bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/inst_combine_deref.rs:55:9: 55:10
-          _1 = const 42_i32;               // scope 0 at $DIR/inst_combine_deref.rs:55:13: 55:15
-          StorageLive(_2);                 // scope 1 at $DIR/inst_combine_deref.rs:56:9: 56:10
-          _2 = const 99_i32;               // scope 1 at $DIR/inst_combine_deref.rs:56:13: 56:15
-          StorageLive(_3);                 // scope 2 at $DIR/inst_combine_deref.rs:57:9: 57:14
-          _3 = &_1;                        // scope 2 at $DIR/inst_combine_deref.rs:57:17: 57:19
-          StorageLive(_4);                 // scope 3 at $DIR/inst_combine_deref.rs:58:9: 58:10
-          _4 = &mut _3;                    // scope 3 at $DIR/inst_combine_deref.rs:58:13: 58:19
-          StorageLive(_5);                 // scope 4 at $DIR/inst_combine_deref.rs:59:10: 59:12
-          StorageLive(_6);                 // scope 4 at $DIR/inst_combine_deref.rs:59:10: 59:12
-          _6 = &_2;                        // scope 4 at $DIR/inst_combine_deref.rs:59:10: 59:12
--         _5 = &(*_6);                     // scope 4 at $DIR/inst_combine_deref.rs:59:10: 59:12
-+         _5 = _6;                         // scope 4 at $DIR/inst_combine_deref.rs:59:10: 59:12
-          (*_4) = move _5;                 // scope 4 at $DIR/inst_combine_deref.rs:59:5: 59:12
-          StorageDead(_5);                 // scope 4 at $DIR/inst_combine_deref.rs:59:11: 59:12
-          StorageDead(_6);                 // scope 4 at $DIR/inst_combine_deref.rs:59:12: 59:13
-          StorageLive(_7);                 // scope 4 at $DIR/inst_combine_deref.rs:60:5: 60:23
-          StorageLive(_8);                 // scope 4 at $DIR/inst_combine_deref.rs:60:5: 60:23
-          StorageLive(_9);                 // scope 4 at $DIR/inst_combine_deref.rs:60:13: 60:21
-          StorageLive(_10);                // scope 4 at $DIR/inst_combine_deref.rs:60:13: 60:15
-          _10 = (*_3);                     // scope 4 at $DIR/inst_combine_deref.rs:60:13: 60:15
-          _9 = Eq(move _10, const 99_i32); // scope 4 at $DIR/inst_combine_deref.rs:60:13: 60:21
-          StorageDead(_10);                // scope 4 at $DIR/inst_combine_deref.rs:60:20: 60:21
-          _8 = Not(move _9);               // scope 4 at $DIR/inst_combine_deref.rs:60:5: 60:23
-          StorageDead(_9);                 // scope 4 at $DIR/inst_combine_deref.rs:60:22: 60:23
-          switchInt(move _8) -> [false: bb2, otherwise: bb1]; // scope 4 at $DIR/inst_combine_deref.rs:60:5: 60:23
-      }
-  
-      bb1: {
-          StorageLive(_11);                // scope 4 at $DIR/inst_combine_deref.rs:60:5: 60:23
-          core::panicking::panic(const "assertion failed: *y == 99"); // scope 4 at $DIR/inst_combine_deref.rs:60:5: 60:23
-                                           // mir::Constant
-                                           // + span: $DIR/inst_combine_deref.rs:60:5: 60:23
-                                           // + literal: Const { ty: fn(&'static str) -> ! {core::panicking::panic}, val: Value(Scalar(<ZST>)) }
-                                           // ty::Const
-                                           // + ty: &str
-                                           // + val: Value(Slice { data: Allocation { bytes: [97, 115, 115, 101, 114, 116, 105, 111, 110, 32, 102, 97, 105, 108, 101, 100, 58, 32, 42, 121, 32, 61, 61, 32, 57, 57], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [67108863], len: Size { raw: 26 } }, size: Size { raw: 26 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 26 })
-                                           // mir::Constant
-                                           // + span: $DIR/inst_combine_deref.rs:1:1: 1:1
-                                           // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [97, 115, 115, 101, 114, 116, 105, 111, 110, 32, 102, 97, 105, 108, 101, 100, 58, 32, 42, 121, 32, 61, 61, 32, 57, 57], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [67108863], len: Size { raw: 26 } }, size: Size { raw: 26 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 26 }) }
-      }
-  
-      bb2: {
-          _7 = const ();                   // scope 4 at $DIR/inst_combine_deref.rs:60:23: 60:23
-          StorageDead(_8);                 // scope 4 at $DIR/inst_combine_deref.rs:60:22: 60:23
-          StorageDead(_7);                 // scope 4 at $DIR/inst_combine_deref.rs:60:22: 60:23
-          _0 = const ();                   // scope 0 at $DIR/inst_combine_deref.rs:54:24: 61:2
-          StorageDead(_4);                 // scope 3 at $DIR/inst_combine_deref.rs:61:1: 61:2
-          StorageDead(_3);                 // scope 2 at $DIR/inst_combine_deref.rs:61:1: 61:2
-          StorageDead(_2);                 // scope 1 at $DIR/inst_combine_deref.rs:61:1: 61:2
-          StorageDead(_1);                 // scope 0 at $DIR/inst_combine_deref.rs:61:1: 61:2
-          return;                          // scope 0 at $DIR/inst_combine_deref.rs:61:2: 61:2
-      }
-  }
-  
diff --git a/src/test/mir-opt/inst_combine_deref.dont_opt.InstCombine.diff b/src/test/mir-opt/inst_combine_deref.dont_opt.InstCombine.diff
deleted file mode 100644
index 69036491a10..00000000000
--- a/src/test/mir-opt/inst_combine_deref.dont_opt.InstCombine.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-- // MIR for `dont_opt` before InstCombine
-+ // MIR for `dont_opt` after InstCombine
-  
-  fn dont_opt() -> u64 {
-      let mut _0: u64;                     // return place in scope 0 at $DIR/inst_combine_deref.rs:43:18: 43:21
-      let _1: i32;                         // in scope 0 at $DIR/inst_combine_deref.rs:44:9: 44:10
-      let mut _5: &i32;                    // in scope 0 at $DIR/inst_combine_deref.rs:48:10: 48:14
-      scope 1 {
-          debug y => _1;                   // in scope 1 at $DIR/inst_combine_deref.rs:44:9: 44:10
-          let _2: &i32;                    // in scope 1 at $DIR/inst_combine_deref.rs:45:9: 45:13
-          scope 2 {
-              debug _ref => _2;            // in scope 2 at $DIR/inst_combine_deref.rs:45:9: 45:13
-              let _3: i32;                 // in scope 2 at $DIR/inst_combine_deref.rs:46:9: 46:10
-              scope 3 {
-                  debug x => _3;           // in scope 3 at $DIR/inst_combine_deref.rs:46:9: 46:10
-                  let mut _4: &i32;        // in scope 3 at $DIR/inst_combine_deref.rs:47:9: 47:15
-                  scope 4 {
-                      debug _1 => _4;      // in scope 4 at $DIR/inst_combine_deref.rs:47:9: 47:15
-                      let _6: i32;         // in scope 4 at $DIR/inst_combine_deref.rs:49:9: 49:11
-                      scope 5 {
-                          debug _4 => _6;  // in scope 5 at $DIR/inst_combine_deref.rs:49:9: 49:11
-                      }
-                  }
-              }
-          }
-      }
-  
-      bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/inst_combine_deref.rs:44:9: 44:10
-          _1 = const 5_i32;                // scope 0 at $DIR/inst_combine_deref.rs:44:13: 44:14
-          StorageLive(_2);                 // scope 1 at $DIR/inst_combine_deref.rs:45:9: 45:13
-          _2 = &_1;                        // scope 1 at $DIR/inst_combine_deref.rs:45:16: 45:18
-          StorageLive(_3);                 // scope 2 at $DIR/inst_combine_deref.rs:46:9: 46:10
-          _3 = const 5_i32;                // scope 2 at $DIR/inst_combine_deref.rs:46:13: 46:14
-          StorageLive(_4);                 // scope 3 at $DIR/inst_combine_deref.rs:47:9: 47:15
-          _4 = &_3;                        // scope 3 at $DIR/inst_combine_deref.rs:47:18: 47:20
-          StorageLive(_5);                 // scope 4 at $DIR/inst_combine_deref.rs:48:10: 48:14
--         _5 = &(*_2);                     // scope 4 at $DIR/inst_combine_deref.rs:48:10: 48:14
-+         _5 = _2;                         // scope 4 at $DIR/inst_combine_deref.rs:48:10: 48:14
-          _4 = move _5;                    // scope 4 at $DIR/inst_combine_deref.rs:48:5: 48:14
-          StorageDead(_5);                 // scope 4 at $DIR/inst_combine_deref.rs:48:13: 48:14
-          StorageLive(_6);                 // scope 4 at $DIR/inst_combine_deref.rs:49:9: 49:11
-          _6 = (*_4);                      // scope 4 at $DIR/inst_combine_deref.rs:49:14: 49:17
-          _0 = const 0_u64;                // scope 5 at $DIR/inst_combine_deref.rs:50:5: 50:6
-          StorageDead(_6);                 // scope 4 at $DIR/inst_combine_deref.rs:51:1: 51:2
-          StorageDead(_4);                 // scope 3 at $DIR/inst_combine_deref.rs:51:1: 51:2
-          StorageDead(_3);                 // scope 2 at $DIR/inst_combine_deref.rs:51:1: 51:2
-          StorageDead(_2);                 // scope 1 at $DIR/inst_combine_deref.rs:51:1: 51:2
-          StorageDead(_1);                 // scope 0 at $DIR/inst_combine_deref.rs:51:1: 51:2
-          return;                          // scope 0 at $DIR/inst_combine_deref.rs:51:2: 51:2
-      }
-  }
-  
diff --git a/src/test/mir-opt/inst_combine_deref.opt_struct.InstCombine.diff b/src/test/mir-opt/inst_combine_deref.opt_struct.InstCombine.diff
deleted file mode 100644
index c867543d05e..00000000000
--- a/src/test/mir-opt/inst_combine_deref.opt_struct.InstCombine.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-- // MIR for `opt_struct` before InstCombine
-+ // MIR for `opt_struct` after InstCombine
-  
-  fn opt_struct(_1: S) -> u64 {
-      debug s => _1;                       // in scope 0 at $DIR/inst_combine_deref.rs:30:15: 30:16
-      let mut _0: u64;                     // return place in scope 0 at $DIR/inst_combine_deref.rs:30:24: 30:27
-      let _2: &u64;                        // in scope 0 at $DIR/inst_combine_deref.rs:31:9: 31:10
-      let mut _5: u64;                     // in scope 0 at $DIR/inst_combine_deref.rs:34:5: 34:7
-      let mut _6: u64;                     // in scope 0 at $DIR/inst_combine_deref.rs:34:10: 34:11
-      scope 1 {
-          debug a => _2;                   // in scope 1 at $DIR/inst_combine_deref.rs:31:9: 31:10
-          let _3: &u64;                    // in scope 1 at $DIR/inst_combine_deref.rs:32:9: 32:10
-          scope 2 {
-              debug b => _3;               // in scope 2 at $DIR/inst_combine_deref.rs:32:9: 32:10
-              let _4: u64;                 // in scope 2 at $DIR/inst_combine_deref.rs:33:9: 33:10
-              scope 3 {
-                  debug x => _4;           // in scope 3 at $DIR/inst_combine_deref.rs:33:9: 33:10
-              }
-          }
-      }
-  
-      bb0: {
-          StorageLive(_2);                 // scope 0 at $DIR/inst_combine_deref.rs:31:9: 31:10
-          _2 = &(_1.0: u64);               // scope 0 at $DIR/inst_combine_deref.rs:31:13: 31:17
-          StorageLive(_3);                 // scope 1 at $DIR/inst_combine_deref.rs:32:9: 32:10
-          _3 = &(_1.1: u64);               // scope 1 at $DIR/inst_combine_deref.rs:32:13: 32:17
-          StorageLive(_4);                 // scope 2 at $DIR/inst_combine_deref.rs:33:9: 33:10
--         _4 = (*_2);                      // scope 2 at $DIR/inst_combine_deref.rs:33:13: 33:15
-+         _4 = (_1.0: u64);                // scope 2 at $DIR/inst_combine_deref.rs:33:13: 33:15
-          StorageLive(_5);                 // scope 3 at $DIR/inst_combine_deref.rs:34:5: 34:7
--         _5 = (*_3);                      // scope 3 at $DIR/inst_combine_deref.rs:34:5: 34:7
-+         _5 = (_1.1: u64);                // scope 3 at $DIR/inst_combine_deref.rs:34:5: 34:7
-          StorageLive(_6);                 // scope 3 at $DIR/inst_combine_deref.rs:34:10: 34:11
-          _6 = _4;                         // scope 3 at $DIR/inst_combine_deref.rs:34:10: 34:11
-          _0 = Add(move _5, move _6);      // scope 3 at $DIR/inst_combine_deref.rs:34:5: 34:11
-          StorageDead(_6);                 // scope 3 at $DIR/inst_combine_deref.rs:34:10: 34:11
-          StorageDead(_5);                 // scope 3 at $DIR/inst_combine_deref.rs:34:10: 34:11
-          StorageDead(_4);                 // scope 2 at $DIR/inst_combine_deref.rs:35:1: 35:2
-          StorageDead(_3);                 // scope 1 at $DIR/inst_combine_deref.rs:35:1: 35:2
-          StorageDead(_2);                 // scope 0 at $DIR/inst_combine_deref.rs:35:1: 35:2
-          return;                          // scope 0 at $DIR/inst_combine_deref.rs:35:2: 35:2
-      }
-  }
-  
diff --git a/src/test/mir-opt/inst_combine_deref.simple_opt.InstCombine.diff b/src/test/mir-opt/inst_combine_deref.simple_opt.InstCombine.diff
deleted file mode 100644
index f52dfe379ca..00000000000
--- a/src/test/mir-opt/inst_combine_deref.simple_opt.InstCombine.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-- // MIR for `simple_opt` before InstCombine
-+ // MIR for `simple_opt` after InstCombine
-  
-  fn simple_opt() -> u64 {
-      let mut _0: u64;                     // return place in scope 0 at $DIR/inst_combine_deref.rs:3:20: 3:23
-      let _1: u64;                         // in scope 0 at $DIR/inst_combine_deref.rs:4:9: 4:10
-      scope 1 {
-          debug x => _1;                   // in scope 1 at $DIR/inst_combine_deref.rs:4:9: 4:10
-          let _2: &u64;                    // in scope 1 at $DIR/inst_combine_deref.rs:5:9: 5:10
-          scope 2 {
-              debug y => _2;               // in scope 2 at $DIR/inst_combine_deref.rs:5:9: 5:10
-              let _3: u64;                 // in scope 2 at $DIR/inst_combine_deref.rs:6:9: 6:10
-              scope 3 {
-                  debug z => _3;           // in scope 3 at $DIR/inst_combine_deref.rs:6:9: 6:10
-              }
-          }
-      }
-  
-      bb0: {
-          StorageLive(_1);                 // scope 0 at $DIR/inst_combine_deref.rs:4:9: 4:10
-          _1 = const 5_u64;                // scope 0 at $DIR/inst_combine_deref.rs:4:13: 4:14
-          StorageLive(_2);                 // scope 1 at $DIR/inst_combine_deref.rs:5:9: 5:10
-          _2 = &_1;                        // scope 1 at $DIR/inst_combine_deref.rs:5:13: 5:15
-          StorageLive(_3);                 // scope 2 at $DIR/inst_combine_deref.rs:6:9: 6:10
--         _3 = (*_2);                      // scope 2 at $DIR/inst_combine_deref.rs:6:13: 6:15
-+         _3 = _1;                         // scope 2 at $DIR/inst_combine_deref.rs:6:13: 6:15
-          _0 = _3;                         // scope 3 at $DIR/inst_combine_deref.rs:7:5: 7:6
-          StorageDead(_3);                 // scope 2 at $DIR/inst_combine_deref.rs:8:1: 8:2
-          StorageDead(_2);                 // scope 1 at $DIR/inst_combine_deref.rs:8:1: 8:2
-          StorageDead(_1);                 // scope 0 at $DIR/inst_combine_deref.rs:8:1: 8:2
-          return;                          // scope 0 at $DIR/inst_combine_deref.rs:8:2: 8:2
-      }
-  }
-  
diff --git a/src/test/mir-opt/tls-access.rs b/src/test/mir-opt/tls-access.rs
index 9036c57556d..19344c86862 100644
--- a/src/test/mir-opt/tls-access.rs
+++ b/src/test/mir-opt/tls-access.rs
@@ -1,3 +1,6 @@
+// EMIT_MIR tls_access.main.PreCodegen.after.mir
+// compile-flags: -Zmir-opt-level=0
+
 #![feature(thread_local)]
 
 #[thread_local]
@@ -9,6 +12,3 @@ fn main() {
         FOO = 42;
     }
 }
-
-// EMIT_MIR tls_access.main.SimplifyCfg-final.after.mir
-// compile-flags: -Zmir-opt-level=0
diff --git a/src/test/mir-opt/tls_access.main.SimplifyCfg-final.after.mir b/src/test/mir-opt/tls_access.main.PreCodegen.after.mir
index de19a226e8f..baa77497e38 100644
--- a/src/test/mir-opt/tls_access.main.SimplifyCfg-final.after.mir
+++ b/src/test/mir-opt/tls_access.main.PreCodegen.after.mir
@@ -1,25 +1,28 @@
-// MIR for `main` after SimplifyCfg-final
+// MIR for `main` after PreCodegen
 
 fn main() -> () {
-    let mut _0: ();                      // return place in scope 0 at $DIR/tls-access.rs:6:11: 6:11
-    let _2: *mut u8;                     // in scope 0 at $DIR/tls-access.rs:8:18: 8:21
-    let mut _3: *mut u8;                 // in scope 0 at $DIR/tls-access.rs:9:9: 9:12
+    let mut _0: ();                      // return place in scope 0 at $DIR/tls-access.rs:9:11: 9:11
+    let _2: *mut u8;                     // in scope 0 at $DIR/tls-access.rs:11:18: 11:21
+    let mut _3: *mut u8;                 // in scope 0 at $DIR/tls-access.rs:12:9: 12:12
     scope 1 {
-        let _1: &u8;                     // in scope 1 at $DIR/tls-access.rs:8:13: 8:14
+        let _1: &u8;                     // in scope 1 at $DIR/tls-access.rs:11:13: 11:14
         scope 2 {
-            debug a => _1;               // in scope 2 at $DIR/tls-access.rs:8:13: 8:14
+            debug a => _1;               // in scope 2 at $DIR/tls-access.rs:11:13: 11:14
         }
     }
 
     bb0: {
-        StorageLive(_1);                 // scope 1 at $DIR/tls-access.rs:8:13: 8:14
-        StorageLive(_2);                 // scope 1 at $DIR/tls-access.rs:8:18: 8:21
-        StorageLive(_3);                 // scope 2 at $DIR/tls-access.rs:9:9: 9:12
-        _3 = &/*tls*/ mut FOO;           // scope 2 at $DIR/tls-access.rs:9:9: 9:12
-        (*_3) = const 42_u8;             // scope 2 at $DIR/tls-access.rs:9:9: 9:17
-        StorageDead(_3);                 // scope 2 at $DIR/tls-access.rs:9:17: 9:18
-        StorageDead(_2);                 // scope 1 at $DIR/tls-access.rs:10:5: 10:6
-        StorageDead(_1);                 // scope 1 at $DIR/tls-access.rs:10:5: 10:6
-        return;                          // scope 0 at $DIR/tls-access.rs:11:2: 11:2
+        StorageLive(_1);                 // scope 1 at $DIR/tls-access.rs:11:13: 11:14
+        StorageLive(_2);                 // scope 1 at $DIR/tls-access.rs:11:18: 11:21
+        _2 = &/*tls*/ mut FOO;           // scope 1 at $DIR/tls-access.rs:11:18: 11:21
+        _1 = &(*_2);                     // scope 1 at $DIR/tls-access.rs:11:17: 11:21
+        StorageLive(_3);                 // scope 2 at $DIR/tls-access.rs:12:9: 12:12
+        _3 = &/*tls*/ mut FOO;           // scope 2 at $DIR/tls-access.rs:12:9: 12:12
+        (*_3) = const 42_u8;             // scope 2 at $DIR/tls-access.rs:12:9: 12:17
+        StorageDead(_3);                 // scope 2 at $DIR/tls-access.rs:12:17: 12:18
+        _0 = const ();                   // scope 1 at $DIR/tls-access.rs:10:5: 13:6
+        StorageDead(_2);                 // scope 1 at $DIR/tls-access.rs:13:5: 13:6
+        StorageDead(_1);                 // scope 1 at $DIR/tls-access.rs:13:5: 13:6
+        return;                          // scope 0 at $DIR/tls-access.rs:14:2: 14:2
     }
 }