about summary refs log tree commit diff
path: root/src/libstd
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/libstd
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/libstd')
-rw-r--r--src/libstd/panicking.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs
index fee7ace92ea..54a57b4444c 100644
--- a/src/libstd/panicking.rs
+++ b/src/libstd/panicking.rs
@@ -286,11 +286,9 @@ pub unsafe fn r#try<R, F: FnOnce() -> R>(f: F) -> Result<R, Box<dyn Any + Send>>
     );
 
     return if r == 0 {
-        debug_assert!(update_panic_count(0) == 0);
         Ok(ManuallyDrop::into_inner(data.r))
     } else {
         update_panic_count(-1);
-        debug_assert!(update_panic_count(0) == 0);
         Err(mem::transmute(raw::TraitObject {
             data: any_data as *mut _,
             vtable: any_vtable as *mut _,