about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorTomasz Miąsko <tomasz.miasko@gmail.com>2020-01-31 00:00:00 +0000
committerTomasz Miąsko <tomasz.miasko@gmail.com>2020-01-31 00:00:00 +0000
commit80c3bec9fefa7a32ca2613d9a9f84046818cec6a (patch)
treeb40251698fcecb9c176b086d93949490ca41bc36 /src/test
parentb1cb3c09097767052d7a10660710b2d540b34daf (diff)
downloadrust-80c3bec9fefa7a32ca2613d9a9f84046818cec6a.tar.gz
rust-80c3bec9fefa7a32ca2613d9a9f84046818cec6a.zip
Remove incorrect debug assertions from catch_unwind
Previously the debug assertions in the implementation of catch_unwind
used to verify consistency of the panic count by checking that the count
is zero just before leaving the function. This incorrectly assumed that
no panic was in progress when entering `catch_unwind`.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/issues/issue-68696-catch-during-unwind.rs26
1 files changed, 26 insertions, 0 deletions
diff --git a/src/test/ui/issues/issue-68696-catch-during-unwind.rs b/src/test/ui/issues/issue-68696-catch-during-unwind.rs
new file mode 100644
index 00000000000..d042bed225d
--- /dev/null
+++ b/src/test/ui/issues/issue-68696-catch-during-unwind.rs
@@ -0,0 +1,26 @@
+// 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
+// ignore-wasm       no panic support
+// ignore-emscripten no panic support
+
+use std::panic::catch_unwind;
+
+#[derive(Default)]
+struct Guard;
+
+impl Drop for Guard {
+    fn drop(&mut self) {
+        let _ = catch_unwind(|| {});
+    }
+}
+
+fn main() {
+    let _ = catch_unwind(|| {
+        let _guard = Guard::default();
+        panic!();
+    });
+}