[v3,5/7] Remove some now-dead exception code
Commit Message
After the rewriting to use try/catch, some of the exception code is
now unused. This patch removes that code.
gdb/ChangeLog
2019-04-07 Tom Tromey <tom@tromey.com>
* common/common-exceptions.h (exception_rethrow): Don't declare.
(TRY_SJLJ): Update comment.
(TRY, CATCH, END_CATCH): Remove.
* common/common-exceptions.c (exception_rethrow): Remove.
---
gdb/ChangeLog | 7 +++++
gdb/common/common-exceptions.c | 10 -------
gdb/common/common-exceptions.h | 53 ++++------------------------------
3 files changed, 13 insertions(+), 57 deletions(-)
@@ -165,16 +165,6 @@ exceptions_state_mc_action_iter_1 (void)
return exceptions_state_mc (CATCH_ITER_1);
}
-/* Called by the default catch block. IOW, we'll get here before
- jumping out to the next outermost scope an exception if a GDB
- exception is not caught. */
-
-void
-exception_rethrow (void)
-{
- throw;
-}
-
/* Return EXCEPTION to the nearest containing CATCH_SJLJ block. */
void
@@ -164,10 +164,6 @@ extern int exceptions_state_mc_action_iter (void);
extern int exceptions_state_mc_action_iter_1 (void);
extern int exceptions_state_mc_catch (struct gdb_exception *, int);
-/* For the C++ try/catch-based TRY/CATCH mechanism. */
-
-extern void exception_rethrow (void) ATTRIBUTE_NORETURN;
-
/* Macro to wrap up standard try/catch behavior.
The double loop lets us correctly handle code "break"ing out of the
@@ -179,24 +175,21 @@ extern void exception_rethrow (void) ATTRIBUTE_NORETURN;
*INDENT-OFF*
- TRY
+ TRY_SJLJ
{
}
- CATCH (e, RETURN_MASK_ERROR)
+ CATCH_SJLJ (e, RETURN_MASK_ERROR)
{
switch (e.reason)
{
case RETURN_ERROR: ...
}
}
- END_CATCH
+ END_CATCH_SJLJ
- Note that the SJLJ version of the macros are actually named
- TRY_SJLJ/CATCH_SJLJ in order to make it possible to call them even
- when TRY/CATCH are mapped to C++ try/catch. The SJLJ variants are
- needed in some cases where gdb exceptions need to cross third-party
- library code compiled without exceptions support (e.g.,
- readline). */
+ The SJLJ variants are needed in some cases where gdb exceptions
+ need to cross third-party library code compiled without exceptions
+ support (e.g., readline). */
#define TRY_SJLJ \
{ \
@@ -215,40 +208,6 @@ extern void exception_rethrow (void) ATTRIBUTE_NORETURN;
#define END_CATCH_SJLJ \
}
-/* We still need to wrap TRY/CATCH in C++ so that cleanups and C++
- exceptions can coexist.
-
- The TRY blocked is wrapped in a do/while(0) so that break/continue
- within the block works the same as in C.
-
- END_CATCH makes sure that even if the CATCH block doesn't want to
- catch the exception, we stop at every frame in the unwind chain to
- run its cleanups, which may e.g., have pointers to stack variables
- that are going to be destroyed.
-
- There's an outer scope around the whole TRY/END_CATCH in order to
- cause a compilation error if you forget to add the END_CATCH at the
- end a TRY/CATCH construct. */
-
-#define TRY \
- { \
- try \
- { \
- do \
- {
-
-#define CATCH(EXCEPTION, MASK) \
- } while (0); \
- } \
- catch (struct gdb_exception ## _ ## MASK &EXCEPTION)
-
-#define END_CATCH \
- catch (...) \
- { \
- exception_rethrow (); \
- } \
- }
-
/* The exception types client code may catch. They're just shims
around gdb_exception that add nothing but type info. Which is used
is selected depending on the MASK argument passed to CATCH. */