MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-28 00:14:07 +01:00
Code Issues Releases Wiki Activity

ircd::ctx: Relax the assertion for uncaught exceptions on context switch.

Browse source
This commit is contained in:
Jason Volk 2018-03-28 13:02:49 -07:00
parent 751b896c3d
commit f07eed2ab9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ircd/ctx.cc
View file

@ -497,7 +497,7 @@ noexcept
:std::exception_ptr{std::current_exception()} :std::exception_ptr{std::current_exception()}
{ {
assert(bool(*this)); assert(bool(*this));
assert(!std::uncaught_exceptions()); //assert(!std::uncaught_exceptions());
__cxa_end_catch(); __cxa_end_catch();
assert(!std::current_exception()); assert(!std::current_exception());
} }
@ -548,8 +548,8 @@ ircd::ctx::continuation::continuation(ctx *const &self)
// stack') for pending exception activities. Due to this limitation we // stack') for pending exception activities. Due to this limitation we
// cannot interleave _cxa_begin_catch() and __cxa_end_catch() by yielding // cannot interleave _cxa_begin_catch() and __cxa_end_catch() by yielding
// the ircd::ctx in an exception handler. // the ircd::ctx in an exception handler.
assert(!std::uncaught_exceptions());
assert(!std::current_exception()); assert(!std::current_exception());
//assert(!std::uncaught_exceptions());
self->cont = this; self->cont = this;
ircd::ctx::current = nullptr; ircd::ctx::current = nullptr;