diff options
| author | Tom Tromey <tom@tromey.com> | 2019-01-28 10:56:58 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-04-08 09:05:41 -0600 |
| commit | 26003a205e207db7985c32ec1964a04652b68413 (patch) | |
| tree | 9800bd8e170266abe2ecc4f07972ba47f88429ff /gdb/common/common-exceptions.c | |
| parent | d272eb370a4c086a1d0f86a7a94e89328ec8d97e (diff) | |
| download | binutils-26003a205e207db7985c32ec1964a04652b68413.zip binutils-26003a205e207db7985c32ec1964a04652b68413.tar.gz binutils-26003a205e207db7985c32ec1964a04652b68413.tar.bz2 | |
Make exception throwing a bit more efficient
This makes exception throwing a bit more efficient, by removing some
copies.
gdb/ChangeLog
2019-04-08 Tom Tromey <tom@tromey.com>
* common/common-exceptions.c (throw_exception): Rename from
throw_exception_cxx. Remove old copy. Make argument const.
(throw_it): Create and throw exception objects directly.
* common/common-exceptions.h (throw_exception): Make argument
const.
(struct gdb_exception_error): Add constructor.
(struct gdb_exception_quit): Add constructor.
Diffstat (limited to 'gdb/common/common-exceptions.c')
| -rw-r--r-- | gdb/common/common-exceptions.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/gdb/common/common-exceptions.c b/gdb/common/common-exceptions.c index d3c01e5..83f2c74 100644 --- a/gdb/common/common-exceptions.c +++ b/gdb/common/common-exceptions.c @@ -180,8 +180,8 @@ throw_exception_sjlj (struct gdb_exception exception) /* Implementation of throw_exception that uses C++ try/catch. */ -static ATTRIBUTE_NORETURN void -throw_exception_cxx (struct gdb_exception exception) +void +throw_exception (const gdb_exception &exception) { if (exception.reason == RETURN_QUIT) { @@ -197,25 +197,24 @@ throw_exception_cxx (struct gdb_exception exception) gdb_assert_not_reached ("invalid return reason"); } -void -throw_exception (struct gdb_exception exception) -{ - throw_exception_cxx (exception); -} - static void ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 0) throw_it (enum return_reason reason, enum errors error, const char *fmt, va_list ap) { - struct gdb_exception e; - - /* Create the exception. */ - e.reason = reason; - e.error = error; - e.message.reset (new std::string (string_vprintf (fmt, ap))); - - /* Throw the exception. */ - throw_exception (e); + if (reason == RETURN_QUIT) + { + gdb_exception_quit ex (reason, error); + ex.message.reset (new std::string (string_vprintf (fmt, ap))); + throw ex; + } + else if (reason == RETURN_ERROR) + { + gdb_exception_error ex (reason, error); + ex.message.reset (new std::string (string_vprintf (fmt, ap))); + throw ex; + } + else + gdb_assert_not_reached ("invalid return reason"); } void |