Merging upstream version 1.72.1+dfsg1.

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

1 files changed, 62 insertions, 0 deletions

diff --git a/tests/mir-opt/inline/cycle.main.Inline.panic-unwind.diff b/tests/mir-opt/inline/cycle.main.Inline.panic-unwind.diff
new file mode 100644
index 000000000..198a23226
--- /dev/null
+++ b/tests/mir-opt/inline/cycle.main.Inline.panic-unwind.diff
@@ -0,0 +1,62 @@
+- // MIR for `main` before Inline
++ // MIR for `main` after Inline
+  
+  fn main() -> () {
+      let mut _0: ();
+      let _1: ();
++     let mut _2: fn() {g};
++     let mut _5: ();
++     scope 1 (inlined f::<fn() {g}>) {
++         debug g => _2;
++         let mut _3: &fn() {g};
++         let _4: ();
++         scope 2 (inlined <fn() {g} as Fn<()>>::call - shim(fn() {g})) {
++             scope 3 (inlined g) {
++                 scope 4 (inlined f::<fn() {main}>) {
++                     debug g => main;
++                     let _6: ();
++                     scope 5 (inlined <fn() {main} as Fn<()>>::call - shim(fn() {main})) {
++                     }
++                 }
++             }
++         }
++     }
+  
+      bb0: {
+          StorageLive(_1);
+-         _1 = f::<fn() {g}>(g) -> [return: bb1, unwind continue];
++         StorageLive(_2);
++         _2 = g;
++         StorageLive(_4);
++         StorageLive(_3);
++         _3 = &_2;
++         StorageLive(_5);
++         _5 = const ();
++         StorageLive(_6);
++         _6 = main() -> [return: bb4, unwind: bb2];
+      }
+  
+      bb1: {
++         StorageDead(_4);
++         StorageDead(_2);
+          StorageDead(_1);
+          _0 = const ();
+          return;
++     }
++ 
++     bb2 (cleanup): {
++         drop(_2) -> [return: bb3, unwind terminate];
++     }
++ 
++     bb3 (cleanup): {
++         resume;
++     }
++ 
++     bb4: {
++         StorageDead(_6);
++         StorageDead(_5);
++         StorageDead(_3);
++         drop(_2) -> [return: bb1, unwind continue];
+      }
+  }
+