From 38f925677d2204473981350cb0dfd28eb65fd45b Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 22 Feb 2005 15:17:14 -0800 Subject: [PATCH] re PR libstdc++/20091 (18_support/14026.cc execution test fails) PR libstdc++/20091 * libsupc++/eh_catch.cc (__cxa_begin_catch): Don't special case decrement of uncaughtExceptions for rethrow. From-SVN: r95419 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/libsupc++/eh_catch.cc | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c7065519aacb..33b228e56d27 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2005-02-22 Richard Henderson + + PR libstdc++/20091 + * libsupc++/eh_catch.cc (__cxa_begin_catch): Don't special case + decrement of uncaughtExceptions for rethrow. + 2005-02-22 Paolo Carlini * include/tr1/functional: Fix License to GPL with exception. diff --git a/libstdc++-v3/libsupc++/eh_catch.cc b/libstdc++-v3/libsupc++/eh_catch.cc index 88060d9f9cda..ba4b7d75f480 100644 --- a/libstdc++-v3/libsupc++/eh_catch.cc +++ b/libstdc++-v3/libsupc++/eh_catch.cc @@ -70,15 +70,14 @@ __cxxabiv1::__cxa_begin_catch (void *exc_obj_in) throw() } int count = header->handlerCount; + // Count is less than zero if this exception was rethrown from an + // immediately enclosing region. if (count < 0) - // This exception was rethrown from an immediately enclosing region. count = -count + 1; else - { - count += 1; - globals->uncaughtExceptions -= 1; - } + count += 1; header->handlerCount = count; + globals->uncaughtExceptions -= 1; if (header != prev) { -- 2.47.2