Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 27 insertions, 0 deletions

diff --git a/tests/ui/panics/panic-recover-propagate.rs b/tests/ui/panics/panic-recover-propagate.rs
new file mode 100644
index 000000000..e110d94b6
--- /dev/null
+++ b/tests/ui/panics/panic-recover-propagate.rs
@@ -0,0 +1,27 @@
+// run-pass
+// needs-unwind
+// ignore-emscripten no threads support
+
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::panic;
+use std::thread;
+
+static A: AtomicUsize = AtomicUsize::new(0);
+
+fn main() {
+    panic::set_hook(Box::new(|_| {
+        A.fetch_add(1, Ordering::SeqCst);
+    }));
+
+    let result = thread::spawn(|| {
+        let result = panic::catch_unwind(|| {
+            panic!("hi there");
+        });
+
+        panic::resume_unwind(result.unwrap_err());
+    }).join();
+
+    let msg = *result.unwrap_err().downcast::<&'static str>().unwrap();
+    assert_eq!("hi there", msg);
+    assert_eq!(1, A.load(Ordering::SeqCst));
+}