aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/libsupc++
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2005-02-22 15:17:14 -0800
committerRichard Henderson <rth@gcc.gnu.org>2005-02-22 15:17:14 -0800
commit38f925677d2204473981350cb0dfd28eb65fd45b (patch)
tree68c8941d98fd75dccc41f5a8b36b4ba8e4d75edf /libstdc++-v3/libsupc++
parentb671e5a4993a4658274fb359e6acd69b613fa5f6 (diff)
downloadgcc-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
Diffstat (limited to 'libstdc++-v3/libsupc++')
-rw-r--r--libstdc++-v3/libsupc++/eh_catch.cc9
1 files changed, 4 insertions, 5 deletions
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)
{