diff options
| author | Pedro Alves <palves@redhat.com> | 2016-04-12 17:49:24 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-04-12 17:49:24 +0100 |
| commit | 0f41b320edb93e2c0cdd76f218811e197156b052 (patch) | |
| tree | 3b03ca2cc2bf41c76515471b9a8c59d8bd7e5ef7 | |
| parent | 173981bc49c9e8fce9271cb47714952dbe2ec627 (diff) | |
| download | gdb-0f41b320edb93e2c0cdd76f218811e197156b052.zip gdb-0f41b320edb93e2c0cdd76f218811e197156b052.tar.gz gdb-0f41b320edb93e2c0cdd76f218811e197156b052.tar.bz2 | |
[C++] Switch TRY/CATCH to real C++ try/catch by default again
Now that we don't ever throw GDB exceptions from signal handlers [1],
we can switch back to having TRY/CATCH implemented in terms of C++
try/catch instead of sigjmp/longjmp.
[1] - https://sourceware.org/ml/gdb-patches/2016-03/msg00351.html
Tested on x86_64 Fedora 23, native and gdbserver.
gdb/ChangeLog:
2016-04-12 Pedro Alves <palves@redhat.com>
* common/common-exceptions.h (GDB_XCPT_TRY): Update comment.
[__cplusplus] (GDB_XCPT): Define as GDB_XCPT_TRY.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/common/common-exceptions.h | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b750266..63e7caa 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-04-12 Pedro Alves <palves@redhat.com> + * common/common-exceptions.h (GDB_XCPT_TRY): Update comment. + [__cplusplus] (GDB_XCPT): Define as GDB_XCPT_TRY. + +2016-04-12 Pedro Alves <palves@redhat.com> + * common/common-exceptions.c (struct catcher) <buf>: Now a 'jmp_buf' instead of SIGJMP_BUF. (exceptions_state_mc_init): Change return type to 'jmp_buf'. diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h index e21713c..6a41741 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 stop throwing exceptions from signal - handlers. */ +/* 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 exceptions state machine. Though declared here by necessity, these functions should be considered internal to |