Don't crash on pthread_cancel

Justinas V. Daugmaudis: This patch prevents abi::__forced_unwind from being eaten

Author: olk

include/boost/coroutine/detail/pull_coroutine_object.hpp

@@ -9,6 +9,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
+#include <boost/context/detail/config.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/exception_ptr.hpp>
 #include <boost/move/move.hpp>
@@ -115,6 +116,10 @@ class pull_coroutine_object : private pull_coroutine_context,
         { fn_( push_coro); }
         catch ( forced_unwind const&)
         {}
+#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
+        catch ( abi::__forced_unwind const&)
+        { throw; }
+#endif
         catch (...)
         { base_t::except_ = current_exception(); }
 
@@ -198,6 +203,10 @@ class pull_coroutine_object< PushCoro, R &, Fn, StackAllocator > : private pull_
         { fn_( push_coro); }
         catch ( forced_unwind const&)
         {}
+#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
+        catch ( abi::__forced_unwind const&)
+        { throw; }
+#endif
         catch (...)
         { base_t::except_ = current_exception(); }
 
@@ -281,6 +290,10 @@ class pull_coroutine_object< PushCoro, void, Fn, StackAllocator > : private pull
         { fn_( push_coro); }
         catch ( forced_unwind const&)
         {}
+#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
+        catch ( abi::__forced_unwind const&)
+        { throw; }
+#endif
         catch (...)
         { base_t::except_ = current_exception(); }
 

include/boost/coroutine/detail/push_coroutine_object.hpp

@@ -9,6 +9,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
+#include <boost/context/detail/config.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/exception_ptr.hpp>
 #include <boost/move/move.hpp>
@@ -127,6 +128,10 @@ class push_coroutine_object : private push_coroutine_context,
         { fn_( pull_coro); }
         catch ( forced_unwind const&)
         {}
+#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
+        catch ( abi::__forced_unwind const&)
+        { throw; }
+#endif
         catch (...)
         { base_t::except_ = current_exception(); }
 
@@ -210,6 +215,10 @@ class push_coroutine_object< PullCoro, R &, Fn, StackAllocator > : private push_
         { fn_( push_coro); }
         catch ( forced_unwind const&)
         {}
+#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
+        catch ( abi::__forced_unwind const&)
+        { throw; }
+#endif
         catch (...)
         { base_t::except_ = current_exception(); }
 
@@ -293,6 +302,10 @@ class push_coroutine_object< PullCoro, void, Fn, StackAllocator > : private push
         { fn_( push_coro); }
         catch ( forced_unwind const&)
         {}
+#if defined( BOOST_CONTEXT_HAS_CXXABI_H )
+        catch ( abi::__forced_unwind const&)
+        { throw; }
+#endif
         catch (...)
         { base_t::except_ = current_exception(); }