diff options
| author | Richard Henderson <rth@redhat.com> | 2005-02-22 15:17:14 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2005-02-22 15:17:14 -0800 |
| commit | 38f925677d2204473981350cb0dfd28eb65fd45b (patch) | |
| tree | 68c8941d98fd75dccc41f5a8b36b4ba8e4d75edf | |
| parent | b671e5a4993a4658274fb359e6acd69b613fa5f6 (diff) | |
| download | gcc-38f925677d2204473981350cb0dfd28eb65fd45b.zip gcc-38f925677d2204473981350cb0dfd28eb65fd45b.tar.gz gcc-38f925677d2204473981350cb0dfd28eb65fd45b.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 c706551..33b228e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2005-02-22 Richard Henderson <rth@redhat.com> + + PR libstdc++/20091 + * libsupc++/eh_catch.cc (__cxa_begin_catch): Don't special case + decrement of uncaughtExceptions for rethrow. + 2005-02-22 Paolo Carlini <pcarlini@suse.de> * 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 88060d9..ba4b7d7 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) { |