From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v2 19/22] Make exception throwing a bit more efficient
Date: Wed, 27 Feb 2019 20:19:00 -0000 [thread overview]
Message-ID: <20190227201849.32210-20-tom@tromey.com> (raw)
In-Reply-To: <20190227201849.32210-1-tom@tromey.com>
This makes exception throwing a bit more efficient, by removing some
copies. This is good now that exceptions are more expensive to copy.
gdb/ChangeLog
2019-02-27 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.
---
gdb/ChangeLog | 8 ++++++++
gdb/common/common-exceptions.c | 37 ++++++++++++++++++++--------------
gdb/common/common-exceptions.h | 2 +-
3 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/gdb/common/common-exceptions.c b/gdb/common/common-exceptions.c
index 4feb80731ac..99a6267c163 100644
--- a/gdb/common/common-exceptions.c
+++ b/gdb/common/common-exceptions.c
@@ -188,8 +188,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 struct gdb_exception &exception)
{
if (exception.reason == RETURN_QUIT)
{
@@ -209,25 +209,32 @@ 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;
+ if (reason == RETURN_QUIT)
+ {
+ gdb_exception_quit ex;
- /* Create the exception. */
- e.reason = reason;
- e.error = error;
- e.message = string_vprintf (fmt, ap);
+ ex.reason = reason;
+ ex.error = error;
+ ex.message = string_vprintf (fmt, ap);
- /* Throw the exception. */
- throw_exception (e);
+ throw ex;
+ }
+ else if (reason == RETURN_ERROR)
+ {
+ gdb_exception_error ex;
+
+ ex.reason = reason;
+ ex.error = error;
+ ex.message = string_vprintf (fmt, ap);
+
+ throw ex;
+ }
+ else
+ gdb_assert_not_reached ("invalid return reason");
}
void
diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h
index c6a8fa66ad6..9d83cad6bec 100644
--- a/gdb/common/common-exceptions.h
+++ b/gdb/common/common-exceptions.h
@@ -205,7 +205,7 @@ struct gdb_quit_bad_alloc
/* Throw an exception (as described by "struct gdb_exception"),
landing in the inner most containing exception handler established
using TRY/CATCH. */
-extern void throw_exception (struct gdb_exception exception)
+extern void throw_exception (const struct gdb_exception &exception)
ATTRIBUTE_NORETURN;
/* Throw an exception by executing a LONG JUMP to the inner most
--
2.17.2
next prev parent reply other threads:[~2019-02-27 20:19 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-27 20:18 [PATCH v2 00/22] Remove cleanups Tom Tromey
2019-02-27 20:18 ` [PATCH v2 05/22] Remove last cleanup from gdbserver Tom Tromey
2019-03-06 19:23 ` Pedro Alves
2019-02-27 20:18 ` [PATCH v2 08/22] Remove last cleanup solib-aix.c Tom Tromey
2019-03-06 19:34 ` Pedro Alves
2019-03-06 21:19 ` Tom Tromey
2019-02-27 20:19 ` [PATCH v2 06/22] Remove cleanup from solib-svr4.c Tom Tromey
2019-03-06 19:24 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 09/22] Remove last cleanup from linux-namespaces.c Tom Tromey
2019-03-06 21:07 ` Pedro Alves
2019-02-27 20:19 ` Tom Tromey [this message]
2019-04-03 17:04 ` [PATCH v2 19/22] Make exception throwing a bit more efficient Pedro Alves
2019-02-27 20:19 ` [PATCH v2 13/22] Remove free_current_contents Tom Tromey
2019-03-06 21:34 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 03/22] Change displaced_step_clear_cleanup with a forward_scope_exit Tom Tromey
2019-03-06 19:23 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 07/22] Remove last cleanups from solib-svr4.c Tom Tromey
2019-03-06 19:32 ` Pedro Alves
2019-03-06 19:39 ` John Baldwin
2019-03-06 21:18 ` Tom Tromey
2019-02-27 20:19 ` [PATCH v2 21/22] Use SCOPE_EXIT in write_gcore_file Tom Tromey
2019-03-06 22:01 ` Pedro Alves
2019-03-06 22:31 ` Tom Tromey
2019-03-06 22:54 ` Pedro Alves
2019-03-06 22:56 ` Tom Tromey
2019-03-06 23:08 ` Tom Tromey
2019-02-27 20:19 ` [PATCH v2 20/22] Replace throw_exception with throw in some cases Tom Tromey
2019-04-03 17:05 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 04/22] C++ify remote notification code Tom Tromey
2019-03-06 19:23 ` Pedro Alves
2019-03-06 21:12 ` Tom Tromey
2019-02-27 20:19 ` [PATCH v2 14/22] Simplify exception handling Tom Tromey
2019-04-02 22:07 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 11/22] Use unique_xmalloc_ptr in remote.c Tom Tromey
2019-03-06 21:17 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 10/22] Remove last cleanups from stabsread.c Tom Tromey
2019-03-06 21:14 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 17/22] Rename gdb exception types Tom Tromey
2019-02-27 20:19 ` [PATCH v2 02/22] Update two cleanup comments Tom Tromey
2019-03-06 19:23 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 01/22] Remove cleanups from coffread.c Tom Tromey
2019-03-06 19:23 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 18/22] Remove some now-dead exception code Tom Tromey
2019-04-03 17:04 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 22/22] Introduce and use bcache_up Tom Tromey
2019-03-06 22:03 ` Pedro Alves
2019-03-07 16:54 ` Tom Tromey
2019-03-07 17:09 ` Pedro Alves
2019-03-07 17:42 ` Tom Tromey
2019-02-27 20:19 ` [PATCH v2 16/22] Rewrite TRY/CATCH Tom Tromey
2019-04-03 17:03 ` Pedro Alves
2019-04-03 18:02 ` Tom Tromey
2019-02-27 20:19 ` [PATCH v2 15/22] Make exceptions use std::string and be self-managing Tom Tromey
2019-04-03 16:20 ` Pedro Alves
2019-04-03 17:58 ` Tom Tromey
2019-04-03 18:28 ` Pedro Alves
2019-02-27 20:19 ` [PATCH v2 12/22] Remove basic cleanup code Tom Tromey
2019-03-06 21:33 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190227201849.32210-20-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox