Merge from rustc

1 files changed, 32 insertions, 0 deletions

diff --git a/tests/mir-opt/const_prop/mutable_variable_aggregate.main.GVN.diff b/tests/mir-opt/const_prop/mutable_variable_aggregate.main.GVN.diff
new file mode 100644
index 00000000000..b6ff7b0fc23
--- /dev/null
+++ b/tests/mir-opt/const_prop/mutable_variable_aggregate.main.GVN.diff
@@ -0,0 +1,32 @@
+- // MIR for `main` before GVN
++ // MIR for `main` after GVN
+  
+  fn main() -> () {
+      let mut _0: ();
+      let mut _1: (i32, i32);
+      scope 1 {
+          debug x => _1;
+          let _2: (i32, i32);
+          scope 2 {
+              debug y => _2;
+          }
+      }
+  
+      bb0: {
+          StorageLive(_1);
+-         _1 = (const 42_i32, const 43_i32);
++         _1 = const (42_i32, 43_i32);
+          (_1.1: i32) = const 99_i32;
+          StorageLive(_2);
+          _2 = _1;
+          _0 = const ();
+          StorageDead(_2);
+          StorageDead(_1);
+          return;
+      }
++ }
++ 
++ ALLOC0 (size: 8, align: 4) {
++     2a 00 00 00 2b 00 00 00                         │ *...+...
+  }
+