Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-68696-catch-during-unwind.rs b/tests/ui/issues/issue-68696-catch-during-unwind.rs
new file mode 100644
index 000000000..2b12a62d0
--- /dev/null
+++ b/tests/ui/issues/issue-68696-catch-during-unwind.rs
@@ -0,0 +1,25 @@
+// Checks that catch_unwind can be used if unwinding is already in progress.
+// Used to fail when standard library had been compiled with debug assertions,
+// due to incorrect assumption that a current thread is not panicking when
+// entering the catch_unwind.
+//
+// run-pass
+
+use std::panic::catch_unwind;
+
+#[derive(Default)]
+struct Guard;
+
+impl Drop for Guard {
+    fn drop(&mut self) {
+        let _ = catch_unwind(|| {});
+    }
+}
+
+fn main() {
+    #[cfg(panic = "unwind")]
+    let _ = catch_unwind(|| {
+        let _guard = Guard::default();
+        panic!();
+    });
+}