Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 41 insertions, 0 deletions

diff --git a/tests/mir-opt/inline/inline_diverging.g.Inline.panic-unwind.diff b/tests/mir-opt/inline/inline_diverging.g.Inline.panic-unwind.diff
new file mode 100644
index 000000000..5663b4624
--- /dev/null
+++ b/tests/mir-opt/inline/inline_diverging.g.Inline.panic-unwind.diff
@@ -0,0 +1,41 @@
+- // MIR for `g` before Inline
++ // MIR for `g` after Inline
+  
+  fn g(_1: i32) -> u32 {
+      debug i => _1;
+      let mut _0: u32;
+      let mut _2: bool;
+      let mut _3: i32;
+      let mut _4: i32;
+      let mut _5: !;
+      let _6: !;
++     scope 1 (inlined panic) {
++         let mut _7: !;
++     }
+  
+      bb0: {
+          StorageLive(_2);
+          StorageLive(_3);
+          _3 = _1;
+          _2 = Gt(move _3, const 0_i32);
+          StorageDead(_3);
+          switchInt(move _2) -> [0: bb2, otherwise: bb1];
+      }
+  
+      bb1: {
+          StorageLive(_4);
+          _4 = _1;
+          _0 = move _4 as u32 (IntToInt);
+          StorageDead(_4);
+          StorageDead(_2);
+          return;
+      }
+  
+      bb2: {
+          StorageLive(_6);
+-         _6 = panic() -> unwind continue;
++         StorageLive(_7);
++         _7 = begin_panic::<&str>(const "explicit panic") -> unwind continue;
+      }
+  }
+