update 32 bit mir-opt tests

Author: lcnr

src/test/mir-opt/array-index-is-temporary/32bit/rustc.main.SimplifyCfg-elaborate-drops.after.mir

@@ -82,7 +82,13 @@ fn main() -> () {
  _1[_7] = move _5; // bb2[0]: scope 3 at $DIR/array-index-is-temporary.rs:16:5: 16:29
  StorageDead(_5); // bb2[1]: scope 3 at $DIR/array-index-is-temporary.rs:16:28: 16:29
  StorageDead(_7); // bb2[2]: scope 3 at $DIR/array-index-is-temporary.rs:16:29: 16:30
- _0 = (); // bb2[3]: scope 0 at $DIR/array-index-is-temporary.rs:12:11: 17:2
+ _0 = const (); // bb2[3]: scope 0 at $DIR/array-index-is-temporary.rs:12:11: 17:2
+ // ty::Const
+ // + ty: ()
+ // + val: Value(Scalar(<ZST>))
+ // mir::Constant
+ // + span: $DIR/array-index-is-temporary.rs:12:11: 17:2
+ // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
  StorageDead(_3); // bb2[4]: scope 2 at $DIR/array-index-is-temporary.rs:17:1: 17:2
  StorageDead(_2); // bb2[5]: scope 1 at $DIR/array-index-is-temporary.rs:17:1: 17:2
  StorageDead(_1); // bb2[6]: scope 0 at $DIR/array-index-is-temporary.rs:17:1: 17:2

src/test/mir-opt/const_allocation/32bit/rustc.main.ConstProp.after.mir

@@ -18,7 +18,13 @@ fn main() -> () {
  _1 = (*_2); // bb0[3]: scope 0 at $DIR/const_allocation.rs:8:5: 8:8
  StorageDead(_2); // bb0[4]: scope 0 at $DIR/const_allocation.rs:8:8: 8:9
  StorageDead(_1); // bb0[5]: scope 0 at $DIR/const_allocation.rs:8:8: 8:9
- _0 = (); // bb0[6]: scope 0 at $DIR/const_allocation.rs:7:11: 9:2
+ _0 = const (); // bb0[6]: scope 0 at $DIR/const_allocation.rs:7:11: 9:2
+ // ty::Const
+ // + ty: ()
+ // + val: Value(Scalar(<ZST>))
+ // mir::Constant
+ // + span: $DIR/const_allocation.rs:7:11: 9:2
+ // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
  return; // bb0[7]: scope 0 at $DIR/const_allocation.rs:9:2: 9:2
  }
 }

src/test/mir-opt/const_allocation2/32bit/rustc.main.ConstProp.after.mir

@@ -18,7 +18,13 @@ fn main() -> () {
  _1 = (*_2); // bb0[3]: scope 0 at $DIR/const_allocation2.rs:5:5: 5:8
  StorageDead(_2); // bb0[4]: scope 0 at $DIR/const_allocation2.rs:5:8: 5:9
  StorageDead(_1); // bb0[5]: scope 0 at $DIR/const_allocation2.rs:5:8: 5:9
- _0 = (); // bb0[6]: scope 0 at $DIR/const_allocation2.rs:4:11: 6:2
+ _0 = const (); // bb0[6]: scope 0 at $DIR/const_allocation2.rs:4:11: 6:2
+ // ty::Const
+ // + ty: ()
+ // + val: Value(Scalar(<ZST>))
+ // mir::Constant
+ // + span: $DIR/const_allocation2.rs:4:11: 6:2
+ // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
  return; // bb0[7]: scope 0 at $DIR/const_allocation2.rs:6:2: 6:2
  }
 }

src/test/mir-opt/const_allocation3/32bit/rustc.main.ConstProp.after.mir

@@ -18,7 +18,13 @@ fn main() -> () {
  _1 = (*_2); // bb0[3]: scope 0 at $DIR/const_allocation3.rs:5:5: 5:8
  StorageDead(_2); // bb0[4]: scope 0 at $DIR/const_allocation3.rs:5:8: 5:9
  StorageDead(_1); // bb0[5]: scope 0 at $DIR/const_allocation3.rs:5:8: 5:9
- _0 = (); // bb0[6]: scope 0 at $DIR/const_allocation3.rs:4:11: 6:2
+ _0 = const (); // bb0[6]: scope 0 at $DIR/const_allocation3.rs:4:11: 6:2
+ // ty::Const
+ // + ty: ()
+ // + val: Value(Scalar(<ZST>))
+ // mir::Constant
+ // + span: $DIR/const_allocation3.rs:4:11: 6:2
+ // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
  return; // bb0[7]: scope 0 at $DIR/const_allocation3.rs:6:2: 6:2
  }
 }

src/test/mir-opt/const_prop/array_index/32bit/rustc.main.ConstProp.diff

@@ -84,7 +84,13 @@
 + // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
  StorageDead(_3); // bb1[1]: scope 0 at $DIR/array_index.rs:5:33: 5:34
  StorageDead(_2); // bb1[2]: scope 0 at $DIR/array_index.rs:5:33: 5:34
- _0 = (); // bb1[3]: scope 0 at $DIR/array_index.rs:4:11: 6:2
+ _0 = const (); // bb1[3]: scope 0 at $DIR/array_index.rs:4:11: 6:2
+ // ty::Const
+ // + ty: ()
+ // + val: Value(Scalar(<ZST>))
+ // mir::Constant
+ // + span: $DIR/array_index.rs:4:11: 6:2
+ // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
  StorageDead(_1); // bb1[4]: scope 0 at $DIR/array_index.rs:6:1: 6:2
  return; // bb1[5]: scope 0 at $DIR/array_index.rs:6:2: 6:2
  }

src/test/mir-opt/const_prop/discriminant/32bit/rustc.main.ConstProp.diff

@@ -87,7 +87,13 @@
  // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
  StorageDead(_2); // bb4[1]: scope 0 at $DIR/discriminant.rs:6:67: 6:68
  StorageDead(_3); // bb4[2]: scope 0 at $DIR/discriminant.rs:6:68: 6:69
- _0 = (); // bb4[3]: scope 0 at $DIR/discriminant.rs:5:11: 7:2
+ _0 = const (); // bb4[3]: scope 0 at $DIR/discriminant.rs:5:11: 7:2
+ // ty::Const
+ // + ty: ()
+ // + val: Value(Scalar(<ZST>))
+ // mir::Constant
+ // + span: $DIR/discriminant.rs:5:11: 7:2
+ // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
  StorageDead(_1); // bb4[4]: scope 0 at $DIR/discriminant.rs:7:1: 7:2
  return; // bb4[5]: scope 0 at $DIR/discriminant.rs:7:2: 7:2
  }

src/test/mir-opt/const_prop/optimizes_into_variable/32bit/rustc.main.ConstProp.diff

@@ -171,7 +171,13 @@
 + // + span: $DIR/optimizes_into_variable.rs:14:13: 14:38
 + // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
  StorageDead(_9); // bb2[7]: scope 2 at $DIR/optimizes_into_variable.rs:14:38: 14:39
- _0 = (); // bb2[8]: scope 0 at $DIR/optimizes_into_variable.rs:11:11: 15:2
+ _0 = const (); // bb2[8]: scope 0 at $DIR/optimizes_into_variable.rs:11:11: 15:2
+ // ty::Const
+ // + ty: ()
+ // + val: Value(Scalar(<ZST>))
+ // mir::Constant
+ // + span: $DIR/optimizes_into_variable.rs:11:11: 15:2
+ // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
  StorageDead(_8); // bb2[9]: scope 2 at $DIR/optimizes_into_variable.rs:15:1: 15:2
  StorageDead(_3); // bb2[10]: scope 1 at $DIR/optimizes_into_variable.rs:15:1: 15:2
  StorageDead(_1); // bb2[11]: scope 0 at $DIR/optimizes_into_variable.rs:15:1: 15:2

src/test/mir-opt/const_prop/optimizes_into_variable/32bit/rustc.main.SimplifyLocals.after.mir

@@ -80,9 +80,16 @@ fn main() -> () {
  // mir::Constant
  // + span: $DIR/optimizes_into_variable.rs:14:13: 14:38
  // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
- StorageDead(_4); // bb0[9]: scope 2 at $DIR/optimizes_into_variable.rs:15:1: 15:2
- StorageDead(_2); // bb0[10]: scope 1 at $DIR/optimizes_into_variable.rs:15:1: 15:2
- StorageDead(_1); // bb0[11]: scope 0 at $DIR/optimizes_into_variable.rs:15:1: 15:2
- return; // bb0[12]: scope 0 at $DIR/optimizes_into_variable.rs:15:2: 15:2
+ _0 = const (); // bb0[9]: scope 0 at $DIR/optimizes_into_variable.rs:11:11: 15:2
+ // ty::Const
+ // + ty: ()
+ // + val: Value(Scalar(<ZST>))
+ // mir::Constant
+ // + span: $DIR/optimizes_into_variable.rs:11:11: 15:2
+ // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
+ StorageDead(_4); // bb0[10]: scope 2 at $DIR/optimizes_into_variable.rs:15:1: 15:2
+ StorageDead(_2); // bb0[11]: scope 1 at $DIR/optimizes_into_variable.rs:15:1: 15:2
+ StorageDead(_1); // bb0[12]: scope 0 at $DIR/optimizes_into_variable.rs:15:1: 15:2
+ return; // bb0[13]: scope 0 at $DIR/optimizes_into_variable.rs:15:2: 15:2
  }
 }

src/test/mir-opt/const_prop/repeat/32bit/rustc.main.ConstProp.diff

@@ -80,7 +80,13 @@
  StorageDead(_2); // bb1[2]: scope 0 at $DIR/repeat.rs:6:31: 6:32
  StorageDead(_4); // bb1[3]: scope 0 at $DIR/repeat.rs:6:32: 6:33
  StorageDead(_3); // bb1[4]: scope 0 at $DIR/repeat.rs:6:32: 6:33
- _0 = (); // bb1[5]: scope 0 at $DIR/repeat.rs:5:11: 7:2
+ _0 = const (); // bb1[5]: scope 0 at $DIR/repeat.rs:5:11: 7:2
+ // ty::Const
+ // + ty: ()
+ // + val: Value(Scalar(<ZST>))
+ // mir::Constant
+ // + span: $DIR/repeat.rs:5:11: 7:2
+ // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
  StorageDead(_1); // bb1[6]: scope 0 at $DIR/repeat.rs:7:1: 7:2
  return; // bb1[7]: scope 0 at $DIR/repeat.rs:7:2: 7:2
  }

src/test/mir-opt/const_prop/slice_len/32bit/rustc.main.ConstProp.diff

@@ -76,7 +76,13 @@
  StorageDead(_4); // bb1[2]: scope 0 at $DIR/slice_len.rs:5:33: 5:34
  StorageDead(_2); // bb1[3]: scope 0 at $DIR/slice_len.rs:5:33: 5:34
  StorageDead(_1); // bb1[4]: scope 0 at $DIR/slice_len.rs:5:33: 5:34
- _0 = (); // bb1[5]: scope 0 at $DIR/slice_len.rs:4:11: 6:2
+ _0 = const (); // bb1[5]: scope 0 at $DIR/slice_len.rs:4:11: 6:2
+ // ty::Const
+ // + ty: ()
+ // + val: Value(Scalar(<ZST>))
+ // mir::Constant
+ // + span: $DIR/slice_len.rs:4:11: 6:2
+ // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
  return; // bb1[6]: scope 0 at $DIR/slice_len.rs:6:2: 6:2
  }
  }