[v3,6/7] Make exception throwing a bit more efficient

Message ID 20190407195715.24669-7-tom@tromey.com
State New
Headers show
Series
  • Make exceptions self-managing
Related show

Commit Message

Tom Tromey April 7, 2019, 7:57 p.m.
This makes exception throwing a bit more efficient, by removing some
copies.

gdb/ChangeLog
2019-04-07  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.
---
 gdb/ChangeLog                  | 10 ++++++++++
 gdb/common/common-exceptions.c | 33 ++++++++++++++++-----------------
 gdb/common/common-exceptions.h | 12 +++++++++++-
 3 files changed, 37 insertions(+), 18 deletions(-)

-- 
2.17.2

Patch

diff --git a/gdb/common/common-exceptions.c b/gdb/common/common-exceptions.c
index d3c01e53387..83f2c74bfd4 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
diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h
index b09a34b0a35..1aedb831a62 100644
--- a/gdb/common/common-exceptions.h
+++ b/gdb/common/common-exceptions.h
@@ -214,6 +214,11 @@  extern int exceptions_state_mc_catch (struct gdb_exception *, int);
 
 struct gdb_exception_error : public gdb_exception
 {
+  gdb_exception_error (enum return_reason r, enum errors e)
+    : gdb_exception (r, e)
+  {
+  }
+
   explicit gdb_exception_error (const gdb_exception &ex) noexcept
     : gdb_exception (ex)
   {
@@ -222,6 +227,11 @@  struct gdb_exception_error : public gdb_exception
 
 struct gdb_exception_quit : public gdb_exception
 {
+  gdb_exception_quit (enum return_reason r, enum errors e)
+    : gdb_exception (r, e)
+  {
+  }
+
   explicit gdb_exception_quit (const gdb_exception &ex) noexcept
     : gdb_exception (ex)
   {
@@ -250,7 +260,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 gdb_exception &exception)
      ATTRIBUTE_NORETURN;
 
 /* Throw an exception by executing a LONG JUMP to the inner most