[PATCH 3/3] Switch gdb's TRY/CATCH to C++ try/catch

Pedro Alves
2016-04-21T23:50:57Z

The exceptions-across-readline issue was fixed by the previous commit.
Let's try this again.

gdb/ChangeLog:
2016-04-21 Pedro Alves <palves@redhat.com>

* common/common-exceptions.h (GDB_XCPT_TRY): Remove mention of
the foreign frames issue.
[__cplusplus] (GDB_XCPT): Define as GDB_XCPT_TRY.
---
gdb/common/common-exceptions.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h
index 4a9f675..ed1cf5e 100644
--- a/gdb/common/common-exceptions.h
+++ b/gdb/common/common-exceptions.h
@@ -122,9 +122,7 @@ struct gdb_exception
the only mode supported when GDB is built as a C program. */
#define GDB_XCPT_SJMP 1

-/* Make GDB exceptions use try/catch behind the scenes. Can't be made
- the default until we handle exceptions crossing foreign frames
- (gdb -> readline callback -> gdb -> error). */
+/* Make GDB exceptions use try/catch behind the scenes. */
#define GDB_XCPT_TRY 2

/* Specify this mode to build with TRY/CATCH mapped directly to raw
@@ -133,8 +131,11 @@ struct gdb_exception
spurious code between the TRY and the CATCH block. */
#define GDB_XCPT_RAW_TRY 3

-/* Always use setjmp/longmp, even in C++ mode. */
-#define GDB_XCPT GDB_XCPT_SJMP
+#ifdef __cplusplus
+# define GDB_XCPT GDB_XCPT_TRY
+#else
+# define GDB_XCPT GDB_XCPT_SJMP
+#endif

/* Functions to drive the sjlj-based exceptions state machine. Though
declared here by necessity, these functions should be considered
--
2.5.5