Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 31 insertions, 0 deletions

diff --git a/tests/codegen/catch-unwind.rs b/tests/codegen/catch-unwind.rs
new file mode 100644
index 000000000..b90ef104c
--- /dev/null
+++ b/tests/codegen/catch-unwind.rs
@@ -0,0 +1,31 @@
+// compile-flags: -O
+
+// On x86 the closure is inlined in foo() producing something like
+// define i32 @foo() [...] {
+// tail call void @bar() [...]
+// ret i32 0
+// }
+// On riscv the closure is another function, placed before fn foo so CHECK can't
+// find it
+// ignore-riscv64 FIXME
+// On s390x the closure is also in another function
+// ignore-s390x FIXME
+
+#![crate_type = "lib"]
+#![feature(c_unwind)]
+
+extern "C" {
+    fn bar();
+}
+
+// CHECK-LABEL: @foo
+#[no_mangle]
+pub unsafe fn foo() -> i32 {
+    // CHECK: call void @bar
+    // CHECK: ret i32 0
+    std::panic::catch_unwind(|| {
+        bar();
+        0
+    })
+    .unwrap()
+}