From 655b9c5105e3e824d24cfba508e1addff08270ef Mon Sep 17 00:00:00 2001
From: mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 19 Nov 2000 02:22:53 +0000
Subject: [PATCH] * libsupc++/exception_support.h: New header file.
* libsupc++/vec.cc: Include it. (__cxa_vec_new2): Recatch exceptions
before rethrows. (__cxa_vec_new3): Likewise. (__cxa_vec_ctor):
Likewise. (__cxa_vec_cctor): Likewise. (__cxa_vec_dtor): Likewise.
(__cxa_vec_delete2): Likewise. (__cxa_vec_delete3): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37551 138bc75d-0d04-0410-961f-82ee72b054a4
---
libstdc++-v3/ChangeLog | 12 +++++
libstdc++-v3/libsupc++/exception_support.cc | 49 +++++-------------
libstdc++-v3/libsupc++/vec.cc | 57 +++++++++++++++------
3 files changed, 64 insertions(+), 54 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1324f10dd51b..64aed389d70d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,15 @@
+2000-11-18 Mark Mitchell <mark@codesourcery.com>
+
+ * libsupc++/exception_support.h: New header file.
+ * libsupc++/vec.cc: Include it.
+ (__cxa_vec_new2): Recatch exceptions before rethrows.
+ (__cxa_vec_new3): Likewise.
+ (__cxa_vec_ctor): Likewise.
+ (__cxa_vec_cctor): Likewise.
+ (__cxa_vec_dtor): Likewise.
+ (__cxa_vec_delete2): Likewise.
+ (__cxa_vec_delete3): Likewise.
+
2000-11-17 Theodore Papadopoulo <Theodore.Papadopoulo@sophia.inria.fr>
* include/bits/stl_tree.h: Overload operators == and != to be able
diff --git a/libstdc++-v3/libsupc++/exception_support.cc b/libstdc++-v3/libsupc++/exception_support.cc
index e147b2169466..ace0927cc1f8 100644
--- a/libstdc++-v3/libsupc++/exception_support.cc
+++ b/libstdc++-v3/libsupc++/exception_support.cc
@@ -32,8 +32,7 @@
#include "typeinfo"
#include "exception"
#include <cstddef>
-#include "gansidecl.h" /* Needed to support macros used in eh-common.h. */
-#include "eh-common.h"
+#include "exception_support.h"
/* Define terminate, unexpected, set_terminate, set_unexpected as
well as the default terminate func and default unexpected func. */
@@ -80,40 +79,6 @@ std::unexpected ()
__unexpected_func ();
}
-/* The type of a function called to clean up an exception object.
- (These will be destructors.) Under the old ABI, these take a
- second argument (the `in-charge' argument), that indicates whether
- or not do delete the object, and whether or not to destroy virtual
- bases. Under the new ABI, there is no second argument. */
-#if !defined (__GXX_ABI_VERSION) || __GXX_ABI_VERSION < 100
-typedef void (*cleanup_fn)(void *, int);
-/* The `2' is the value for the in-charge parameter that indicates
- that virtual bases should be destroyed. */
-#define CALL_CLEANUP(FN, THIS) FN (THIS, 2)
-#else
-typedef void (*cleanup_fn)(void *);
-#define CALL_CLEANUP(FN, THIS) FN (THIS)
-#endif
-
-/* C++-specific state about the current exception.
- This must match init_exception_processing().
-
- Note that handlers and caught are not redundant; when rethrown, an
- exception can have multiple active handlers and still be considered
- uncaught. */
-
-struct cp_eh_info
-{
- __eh_info eh_info;
- void *value;
- void *type;
- cleanup_fn cleanup;
- bool caught;
- cp_eh_info *next;
- long handlers;
- void *original_value;
-};
-
/* Language-specific EH info pointer, defined in libgcc2. */
extern "C" cp_eh_info **__get_eh_info (); // actually void **
@@ -281,7 +246,7 @@ __cp_pop_exception (cp_eh_info *p)
/* We're doing a rethrow. Find the currently handled exception, mark it
uncaught, and move it to the top of the EH stack. */
-extern "C" void
+extern "C" cp_eh_info *
__uncatch_exception (void)
{
cp_eh_info **stack = __get_eh_info ();
@@ -308,6 +273,16 @@ __uncatch_exception (void)
}
p->caught = false;
+
+ return p;
+}
+
+/* Mark P as caught after we previously marked it as uncaught. */
+
+extern "C" void
+__recatch_exception (cp_eh_info *p)
+{
+ p->caught = true;
}
/* As per [except.unexpected]:
diff --git a/libstdc++-v3/libsupc++/vec.cc b/libstdc++-v3/libsupc++/vec.cc
index 691bd04d9433..f00d3c11b230 100644
--- a/libstdc++-v3/libsupc++/vec.cc
+++ b/libstdc++-v3/libsupc++/vec.cc
@@ -32,13 +32,21 @@
#include <new>
#include <exception>
-// Exception handling hook, to mark current exception as not caught --
-// generally because we're about to rethrow it after some cleanup.
-extern "C" void __uncatch_exception (void);
+#include "exception_support.h"
namespace __cxxabiv1
{
+namespace
+{
+struct uncatch_exception {
+ uncatch_exception () { p = __uncatch_exception (); }
+ ~uncatch_exception () { __recatch_exception (p); }
+
+ cp_eh_info *p;
+};
+}
+
/* allocate and construct array */
extern "C" void *
__cxa_vec_new (std::size_t element_count,
@@ -76,8 +84,10 @@ __cxa_vec_new2 (std::size_t element_count,
}
catch (...)
{
- __uncatch_exception ();
- dealloc (base - padding_size);
+ {
+ uncatch_exception ue;
+ dealloc (base - padding_size);
+ }
throw;
}
return base;
@@ -107,8 +117,10 @@ __cxa_vec_new3 (std::size_t element_count,
}
catch (...)
{
- __uncatch_exception ();
- dealloc (base - padding_size, size);
+ {
+ uncatch_exception ue;
+ dealloc (base - padding_size, size);
+ }
throw;
}
return base;
@@ -133,8 +145,10 @@ __cxa_vec_ctor (void *array_address,
}
catch (...)
{
- __uncatch_exception ();
- __cxa_vec_dtor (array_address, ix, element_size, destructor);
+ {
+ uncatch_exception ue;
+ __cxa_vec_dtor (array_address, ix, element_size, destructor);
+ }
throw;
}
}
@@ -162,8 +176,10 @@ __cxa_vec_cctor (void *dest_array,
}
catch (...)
{
- __uncatch_exception ();
- __cxa_vec_dtor (dest_array, ix, element_size, destructor);
+ {
+ uncatch_exception ue;
+ __cxa_vec_dtor (dest_array, ix, element_size, destructor);
+ }
throw;
}
}
@@ -197,8 +213,11 @@ __cxa_vec_dtor (void *array_address,
// [except.ctor]/3 If a destructor called during stack unwinding
// exits with an exception, terminate is called.
std::terminate ();
- __uncatch_exception ();
- __cxa_vec_dtor (array_address, ix, element_size, destructor);
+ {
+ uncatch_exception ue;
+ __cxa_vec_dtor (array_address, ix, element_size,
+ destructor);
+ }
throw;
}
}
@@ -236,8 +255,10 @@ __cxa_vec_delete2 (void *array_address,
}
catch (...)
{
- __uncatch_exception ();
- dealloc (base);
+ {
+ uncatch_exception ue;
+ dealloc (base);
+ }
throw;
}
}
@@ -266,8 +287,10 @@ __cxa_vec_delete3 (void *array_address,
}
catch (...)
{
- __uncatch_exception ();
- dealloc (base, size);
+ {
+ uncatch_exception ue;
+ dealloc (base, size);
+ }
throw;
}
}
--
GitLab