Merge from rustc

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/mir-opt/lower_array_len.array_len.GVN.panic-unwind.diff b/tests/mir-opt/lower_array_len.array_len.GVN.panic-unwind.diff
new file mode 100644
index 00000000000..9c1b9a708c5
--- /dev/null
+++ b/tests/mir-opt/lower_array_len.array_len.GVN.panic-unwind.diff
@@ -0,0 +1,26 @@
+- // MIR for `array_len` before GVN
++ // MIR for `array_len` after GVN
+  
+  fn array_len(_1: &[u8; N]) -> usize {
+      debug arr => _1;
+      let mut _0: usize;
+      let mut _2: &[u8];
+      let mut _3: &[u8; N];
+  
+      bb0: {
+          StorageLive(_2);
+          StorageLive(_3);
+          _3 = &(*_1);
+          _2 = move _3 as &[u8] (PointerCoercion(Unsize));
+          StorageDead(_3);
+-         _0 = PtrMetadata(move _2);
++         _0 = const N;
+          goto -> bb1;
+      }
+  
+      bb1: {
+          StorageDead(_2);
+          return;
+      }
+  }
+