From 80c3bec9fefa7a32ca2613d9a9f84046818cec6a Mon Sep 17 00:00:00 2001
From: Tomasz Miąsko <tomasz.miasko@gmail.com>
Date: Fri, 31 Jan 2020 00:00:00 +0000
Subject: 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`.
---
 src/libstd/panicking.rs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/libstd')

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 _,
-- 
cgit 1.4.1-3-g733a5