Commit: b366739fd4ad21a76b7f39bf28243a315124d885 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Revision: b366739fd4ad21a76b7f39bf28243a315124d885 (tree)
• Time: 2016-09-24 01:57:50
• Author: Pedro Alves <palves@redh...>
• Commiter: Pedro Alves

Log Message

Get rid of gdb_exception::message copying/xstrdup'ing

Gets rid of all gdb_exception (and thus gdb_exception::message)
copying introduded by the previous patch, by:

- using rethrow_exception whenever we want to rethrow from within a

catch block. rethrow_exception does "throw;", which throws the
original exception object.

- making throw_exception take an rval reference, in order to allow

moving the original exception's message string into the thrown
exception object.

I thought of making throw_exception take a non-const lval reference,
which should work too, but it feels like forcing callers to use
gdb::move is less surprising. Otherwise, there'd be no visible clue
at the caller site that would make it obvious that throw_exception
destroys its argument.

Actually, now that I think more about this, since we're always going
to end up copying the exception, it may be better to instead rely on
copy elision, and keep things simpler by always passing by value
around. The rethrow_exception bits should still be useful though.

Change Summary

• modified: gdb/aarch64-tdep.c
• modified: gdb/amd64-tdep.c
• modified: gdb/break-catch-throw.c
• modified: gdb/breakpoint.c
• modified: gdb/btrace.c
• modified: gdb/cli/cli-script.c
• modified: gdb/common/common-exceptions.c
• modified: gdb/common/common-exceptions.h
• modified: gdb/compile/compile-object-run.c
• modified: gdb/cp-abi.c
• modified: gdb/dwarf2-frame.c
• modified: gdb/dwarf2loc.c
• modified: gdb/eval.c
• modified: gdb/exceptions.c
• modified: gdb/frame-unwind.c
• modified: gdb/frame.c
• modified: gdb/gcore.c
• modified: gdb/gdbserver/linux-low.c
• modified: gdb/gdbtypes.c
• modified: gdb/i386-tdep.c
• modified: gdb/infcall.c
• modified: gdb/infcmd.c
• modified: gdb/infrun.c
• modified: gdb/linespec.c
• modified: gdb/linux-nat.c
• modified: gdb/parse.c
• modified: gdb/record-btrace.c
• modified: gdb/remote.c
• modified: gdb/rs6000-tdep.c
• modified: gdb/s390-linux-tdep.c
• modified: gdb/solib-spu.c
• modified: gdb/stack.c
• modified: gdb/symtab.c
• modified: gdb/target.c
• modified: gdb/tracefile-tfile.c
• modified: gdb/valops.c
• modified: gdb/xml-support.c

Incremental Difference

--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -556,7 +556,7 @@ aarch64_make_prologue_cache (struct frame_info *this_frame, void **this_cache)
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 
@@ -683,7 +683,7 @@ aarch64_make_stub_cache (struct frame_info *this_frame, void **this_cache)
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -2541,7 +2541,7 @@ amd64_frame_cache (struct frame_info *this_frame, void **this_cache)
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 
@@ -2669,7 +2669,7 @@ amd64_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache)
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 
@@ -2850,7 +2850,7 @@ amd64_epilogue_frame_cache (struct frame_info *this_frame, void **this_cache)
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/break-catch-throw.c
+++ b/gdb/break-catch-throw.c
@@ -243,7 +243,7 @@ re_set_exception_catchpoint (struct breakpoint *self)
 	  /* NOT_FOUND_ERROR just means the breakpoint will be
 	     pending, so let it through.  */
 	  if (ex.error != NOT_FOUND_ERROR)
-	    throw_exception (ex);
+	    rethrow_exception ();
 	}
       END_CATCH
     }

--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -9809,7 +9809,7 @@ create_breakpoint (struct gdbarch *gdbarch,
 	     error.  */
 
 	  if (pending_break_support == AUTO_BOOLEAN_FALSE)
-	    throw_exception (e);
+	    rethrow_exception ();
 
 	  exception_print (gdb_stderr, e);
 
@@ -9827,7 +9827,7 @@ create_breakpoint (struct gdbarch *gdbarch,
 	  pending = 1;
 	}
       else
-	throw_exception (e);
+	rethrow_exception ();
     }
   END_CATCH
 
@@ -11464,7 +11464,7 @@ watch_command_1 (const char *arg, int accessflag, int from_tty,
   CATCH (const gdb_exception &e)
     {
       delete_breakpoint (b);
-      throw_exception (e);
+      rethrow_exception ();
     }
   END_CATCH
 
@@ -14425,11 +14425,11 @@ location_to_sals (struct breakpoint *b, struct event_location *location,
     {
       b->ops->decode_location (b, location, search_pspace, &sals);
     }
-  CATCH (const gdb_error &e)
+  CATCH (gdb_error &e)
     {
       int not_found_and_ok = 0;
 
-      exception = e;
+      exception = gdb::move (e);
 
       /* For pending breakpoints, it's expected that parsing will
 	 fail until the right shared library is loaded.  User has
@@ -14457,7 +14457,7 @@ location_to_sals (struct breakpoint *b, struct event_location *location,
 	     happens only when a binary has changed, I don't know
 	     which approach is better.  */
 	  b->enable_state = bp_disabled;
-	  throw_exception (e);
+	  rethrow_exception ();
 	}
     }
   END_CATCH
@@ -15774,7 +15774,7 @@ save_breakpoints (char *filename, int from_tty,
 	CATCH (const gdb_exception &ex)
 	  {
 	    ui_out_redirect (current_uiout, NULL);
-	    throw_exception (ex);
+	    rethrow_exception ();
 	  }
 	END_CATCH
 

--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -958,7 +958,7 @@ btrace_compute_ftrace_pt (struct thread_info *tp,
 
       btrace_finalize_ftrace_pt (decoder, tp, level);
 
-      throw_exception (error);
+      rethrow_exception ();
     }
   END_CATCH
 
@@ -2499,8 +2499,7 @@ btrace_maint_update_pt_packets (struct btrace_thread_info *btinfo)
     {
       pt_pkt_free_decoder (decoder);
 
-      if (except.reason < 0)
-	throw_exception (except);
+      rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -1116,7 +1116,7 @@ process_next_line (char *p, struct command_line **command, int parse_commands,
       CATCH (const gdb_exception &ex)
 	{
 	  xfree (*command);
-	  throw_exception (ex);
+	  rethrow_exception ();
 	}
       END_CATCH
     }

--- a/gdb/common/common-exceptions.c
+++ b/gdb/common/common-exceptions.c
@@ -208,7 +208,7 @@ exception_try_scope_exit (void *saved_state)
    exception is not caught.  */
 
 void
-exception_rethrow (void)
+rethrow_exception ()
 {
   /* Run this scope's cleanups before re-throwing to the next
      outermost scope.  */
@@ -257,16 +257,6 @@ throw_it (enum return_reason reason, enum errors error, const char *fmt,
 }
 
 void
-throw_exception (const gdb_exception &exception)
-{
-  const char *message = (exception.message != NULL
-			 ? xstrdup (exception.message)
-			 : NULL);
-
-  throw_exception (exception.reason, exception.error, message);
-}
-
-void
 throw_exception (gdb_exception_rval_ref exception)
 {
   const char *message = exception.message;

--- a/gdb/common/common-exceptions.h
+++ b/gdb/common/common-exceptions.h
@@ -262,7 +262,6 @@ extern struct gdb_exception exceptions_state_mc_catch ();
 
 extern void *exception_try_scope_entry (void);
 extern void exception_try_scope_exit (void *saved_state);
-extern void exception_rethrow (void);
 
 /* Macro to wrap up standard try/catch behavior.
 
@@ -351,7 +350,7 @@ struct exception_try_scope
 #define END_CATCH			       \
   catch (...)				       \
     {					       \
-      exception_rethrow ();		       \
+      rethrow_exception ();		       \
     }
 
 #else
@@ -403,13 +402,13 @@ struct gdb_quit_bad_alloc
 /* *INDENT-ON* */
 
 /* Throw an exception (as described by "struct gdb_exception").  */
-extern void throw_exception (const gdb_exception &exception)
-  ATTRIBUTE_NORETURN;
-
-/* Likewise, but take an rval reference.  */
 extern void throw_exception (gdb_exception_rval_ref exception)
   ATTRIBUTE_NORETURN;
 
+/* Rethrow the currently caught exception.  Wrapper around "throw;"
+   that also handles cleanups.  */
+extern void rethrow_exception (void);
+
 /* Throw an exception by executing a LONG JUMP to the inner most
    containing exception handler established using TRY_SJLJ.  Works the
    same regardless of whether GDB is built as a C program or a C++

--- a/gdb/compile/compile-object-run.c
+++ b/gdb/compile/compile-object-run.c
@@ -185,7 +185,7 @@ compile_object_run (struct compile_module *module)
       gdb_assert (!(dtor_found && executed));
       if (!dtor_found && !executed)
 	do_module_cleanup (data, 0);
-      throw_exception (ex);
+      rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -82,7 +82,7 @@ baseclass_offset (struct type *type, int index, const gdb_byte *valaddr,
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
 
       throw_error (NOT_AVAILABLE_ERROR,
 		   _("Cannot determine virtual baseclass offset "

--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -1137,7 +1137,7 @@ dwarf2_frame_cache (struct frame_info *this_frame, void **this_cache)
 	  return cache;
 	}
 
-      throw_exception (ex);
+      rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -1080,7 +1080,7 @@ call_site_find_chain (struct gdbarch *gdbarch, CORE_ADDR caller_pc,
 	  return NULL;
 	}
       else
-	throw_exception (e);
+	rethrow_exception ();
     }
   END_CATCH
 
@@ -2349,7 +2349,7 @@ dwarf2_evaluate_loc_desc_full (struct type *type, struct frame_info *frame,
 	  return allocate_optimized_out_value (type);
 	}
       else
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -238,7 +238,7 @@ fetch_subexp_value (struct expression *exp, int *pc, struct value **valp,
 	  if (!preserve_errors)
 	    break;
 	default:
-	  throw_exception (ex);
+	  rethrow_exception ();
 	  break;
 	}
     }
@@ -780,7 +780,7 @@ evaluate_subexp_standard (struct type *expect_type,
 	      ret = value_zero (SYMBOL_TYPE (exp->elts[pc + 2].symbol),
 				not_lval);
 	    else
-	      throw_exception (except);
+	      rethrow_exception ();
 	  }
 	END_CATCH
 
@@ -1460,7 +1460,7 @@ evaluate_subexp_standard (struct type *expect_type,
 		      if (except.error == NOT_FOUND_ERROR)
 			break;
 		      else
-			throw_exception (except);
+			rethrow_exception ();
 		    }
 		  END_CATCH
 
@@ -1887,7 +1887,7 @@ evaluate_subexp_standard (struct type *expect_type,
 	      if (except.error == NOT_FOUND_ERROR)
 		break;
 	      else
-		throw_exception (except);
+		rethrow_exception ();
 	    }
 	  END_CATCH
 

--- a/gdb/exceptions.c
+++ b/gdb/exceptions.c
@@ -182,9 +182,9 @@ catch_exceptions_with_msg (struct ui_out *func_uiout,
     {
       val = (*func) (current_uiout, func_args);
     }
-  CATCH (const gdb_exception &ex)
+  CATCH (gdb_exception &ex)
     {
-      exception = ex;
+      exception = gdb::move (ex);
     }
   END_CATCH
 
@@ -195,7 +195,7 @@ catch_exceptions_with_msg (struct ui_out *func_uiout,
     {
       /* The caller didn't request that the event be caught.
 	 Rethrow.  */
-      throw_exception (exception);
+      throw_exception (gdb::move (exception));
     }
 
   exception_print (gdb_stderr, exception);
@@ -235,9 +235,9 @@ catch_errors (catch_errors_ftype *func, void *func_args, char *errstring,
     {
       val = func (func_args);
     }
-  CATCH (const gdb_exception &ex)
+  CATCH (gdb_exception &ex)
     {
-      exception = ex;
+      exception = gdb::move (ex);
     }
   END_CATCH
 
@@ -248,7 +248,7 @@ catch_errors (catch_errors_ftype *func, void *func_args, char *errstring,
     {
       /* The caller didn't request that the event be caught.
 	 Rethrow.  */
-      throw_exception (exception);
+      throw_exception (gdb::move (exception));
     }
 
   exception_fprintf (gdb_stderr, exception, "%s", errstring);

--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -117,7 +117,7 @@ frame_unwind_try_unwinder (struct frame_info *this_frame, void **this_cache,
 	  do_cleanups (old_cleanup);
 	  return 0;
 	}
-      throw_exception (ex);
+      rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -892,7 +892,7 @@ frame_unwind_pc (struct frame_info *this_frame)
 					this_frame->level);
 		}
 	      else
-		throw_exception (ex);
+		rethrow_exception ();
 	    }
 	  END_CATCH
 
@@ -2058,7 +2058,7 @@ get_prev_frame_always (struct frame_info *this_frame)
 	  prev_frame = NULL;
 	}
       else
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 
@@ -2301,7 +2301,7 @@ get_frame_pc_if_available (struct frame_info *frame, CORE_ADDR *pc)
       if (ex.error == NOT_AVAILABLE_ERROR)
 	return 0;
       else
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 
@@ -2383,7 +2383,7 @@ get_frame_address_in_block_if_available (struct frame_info *this_frame,
     {
       if (ex.error == NOT_AVAILABLE_ERROR)
 	return 0;
-      throw_exception (ex);
+      rethrow_exception ();
     }
   END_CATCH
 
@@ -2671,7 +2671,7 @@ get_frame_language (struct frame_info *frame)
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/gcore.c
+++ b/gdb/gcore.c
@@ -123,16 +123,16 @@ write_gcore_file (bfd *obfd)
     {
       write_gcore_file_1 (obfd);
     }
-  CATCH (const gdb_exception &e)
+  CATCH (gdb_exception &e)
     {
-      except = e;
+      except = gdb::move (e);
     }
   END_CATCH
 
   target_done_generating_core ();
 
   if (except.reason < 0)
-    throw_exception (except);
+    throw_exception (gdb::move (except));
 }
 
 static void

--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -1527,7 +1527,7 @@ linux_detach_one_lwp (struct lwp_info *lwp)
   CATCH (const gdb_error &ex)
     {
       if (!check_ptrace_stopped_lwp_gone (lwp))
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 
@@ -4586,7 +4586,7 @@ linux_resume_one_lwp (struct lwp_info *lwp,
   CATCH (const gdb_error &ex)
     {
       if (!check_ptrace_stopped_lwp_gone (lwp))
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 }

--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -3534,9 +3534,9 @@ types_deeply_equal (struct type *type1, struct type *type2)
     {
       result = check_types_worklist (&worklist, cache);
     }
-  CATCH (const gdb_exception &ex)
+  CATCH (gdb_exception &ex)
     {
-      except = ex;
+      except = gdb::move (ex);
     }
   END_CATCH
 
@@ -3545,7 +3545,7 @@ types_deeply_equal (struct type *type1, struct type *type2)
 
   /* Rethrow if there was a problem.  */
   if (except.reason < 0)
-    throw_exception (except);
+    throw_exception (gdb::move (except));
 
   return result;
 }

--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -2076,7 +2076,7 @@ i386_frame_cache (struct frame_info *this_frame, void **this_cache)
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 
@@ -2256,7 +2256,7 @@ i386_epilogue_frame_cache (struct frame_info *this_frame, void **this_cache)
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 
@@ -2452,7 +2452,7 @@ i386_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache)
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -606,9 +606,9 @@ run_inferior_call (struct call_thread_fsm *sm,
 	 target supports asynchronous execution.  */
       wait_sync_command_done ();
     }
-  CATCH (const gdb_exception &e)
+  CATCH (gdb_exception &e)
     {
-      caught_error = e;
+      caught_error = gdb::move (e);
     }
   END_CATCH
 
@@ -1209,7 +1209,7 @@ When the function is done executing, GDB will silently stop."),
 		       e.message, name);
 	case RETURN_QUIT:
 	default:
-	  throw_exception (e);
+	  throw_exception (gdb::move (e));
 	}
     }
 

--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -431,7 +431,7 @@ post_create_inferior (struct target_ops *target, int from_tty)
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1905,7 +1905,7 @@ displaced_step_prepare (ptid_t ptid)
 
       if (ex.error != MEMORY_ERROR
 	  && ex.error != NOT_SUPPORTED_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
 
       if (debug_infrun)
 	{

--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -2296,9 +2296,9 @@ parse_linespec (linespec_parser *parser, const char *arg)
 	    = symtabs_from_filename (user_filename,
 				     PARSER_STATE (parser)->search_pspace);
 	}
-      CATCH (const gdb_error &ex)
+      CATCH (gdb_error &ex)
 	{
-	  file_exception = ex;
+	  file_exception = gdb::move (ex);
 	}
       END_CATCH
 
@@ -2348,7 +2348,7 @@ parse_linespec (linespec_parser *parser, const char *arg)
       /* The linespec didn't parse.  Re-throw the file exception if
 	 there was one.  */
       if (file_exception.reason < 0)
-	throw_exception (file_exception);
+	throw_exception (gdb::move (file_exception));
 
       /* Otherwise, the symbol is not found.  */
       symbol_not_found_error (PARSER_EXPLICIT (parser)->function_name,
@@ -2498,15 +2498,7 @@ event_location_to_sals (linespec_parser *parser,
     case LINESPEC_LOCATION:
       {
 	PARSER_STATE (parser)->is_linespec = 1;
-	TRY
-	  {
-	    result = parse_linespec (parser, get_linespec_location (location));
-	  }
-	CATCH (const gdb_error &except)
-	  {
-	    throw_exception (except);
-	  }
-	END_CATCH
+	result = parse_linespec (parser, get_linespec_location (location));
       }
       break;
 
@@ -3372,7 +3364,7 @@ find_linespec_symbols (struct linespec_state *state,
 	  CATCH (const gdb_error &except)
 	    {
 	      if (except.error != NOT_FOUND_ERROR)
-		throw_exception (except);
+		rethrow_exception ();
 	    }
 	  END_CATCH
 	}

--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -1441,7 +1441,7 @@ detach_one_lwp (struct lwp_info *lp, int *signo_p)
   CATCH (const gdb_error &ex)
     {
       if (!check_ptrace_stopped_lwp_gone (lp))
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 
@@ -1634,7 +1634,7 @@ linux_resume_one_lwp (struct lwp_info *lp, int step, enum gdb_signal signo)
   CATCH (const gdb_error &ex)
     {
       if (!check_ptrace_stopped_lwp_gone (lp))
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 }
@@ -3589,7 +3589,7 @@ resume_stopped_resumed_lwps (struct lwp_info *lp, void *data)
       CATCH (const gdb_error &ex)
 	{
 	  if (!check_ptrace_stopped_lwp_gone (lp))
-	    throw_exception (ex);
+	    rethrow_exception ();
 	}
       END_CATCH
     }

--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -1227,7 +1227,7 @@ parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc,
       if (! parse_completion)
 	{
 	  xfree (ps.expout);
-	  throw_exception (except);
+	  rethrow_exception ();
 	}
     }
   END_CATCH

--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -1421,7 +1421,7 @@ record_btrace_insert_breakpoint (struct target_ops *ops,
   CATCH (const gdb_exception &except)
     {
       replay_memory_access = old;
-      throw_exception (except);
+      rethrow_exception ();
     }
   END_CATCH
   replay_memory_access = old;
@@ -1454,7 +1454,7 @@ record_btrace_remove_breakpoint (struct target_ops *ops,
   CATCH (const gdb_exception &except)
     {
       replay_memory_access = old;
-      throw_exception (except);
+      rethrow_exception ();
     }
   END_CATCH
   replay_memory_access = old;
@@ -1943,7 +1943,7 @@ get_thread_current_frame (struct thread_info *tp)
       /* Restore the previous inferior_ptid.  */
       inferior_ptid = old_inferior_ptid;
 
-      throw_exception (except);
+      rethrow_exception ();
     }
   END_CATCH
 
@@ -2031,7 +2031,7 @@ record_btrace_start_replaying (struct thread_info *tp)
 
       registers_changed_ptid (tp->ptid);
 
-      throw_exception (except);
+      rethrow_exception ();
     }
   END_CATCH
 
@@ -2913,7 +2913,7 @@ cmd_record_btrace_bts_start (char *args, int from_tty)
   CATCH (const gdb_exception &exception)
     {
       record_btrace_conf.format = BTRACE_FORMAT_NONE;
-      throw_exception (exception);
+      rethrow_exception ();
     }
   END_CATCH
 }
@@ -2935,7 +2935,7 @@ cmd_record_btrace_pt_start (char *args, int from_tty)
   CATCH (const gdb_exception &exception)
     {
       record_btrace_conf.format = BTRACE_FORMAT_NONE;
-      throw_exception (exception);
+      rethrow_exception ();
     }
   END_CATCH
 }
@@ -2965,7 +2965,7 @@ cmd_record_btrace_start (char *args, int from_tty)
       CATCH (const gdb_exception &exception)
 	{
 	  record_btrace_conf.format = BTRACE_FORMAT_NONE;
-	  throw_exception (exception);
+	  rethrow_exception ();
 	}
       END_CATCH
     }

--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -5088,7 +5088,7 @@ remote_open_1 (const char *name, int from_tty,
 	  remote_unpush_target ();
 	if (target_async_permitted)
 	  wait_forever_enabled_p = 1;
-	throw_exception (ex);
+	rethrow_exception ();
       }
     END_CATCH
   }
@@ -8988,7 +8988,7 @@ remote_kill_k (void)
       /* Otherwise, something went wrong.  We didn't actually kill
 	 the target.  Just propagate the exception, and let the
 	 user or higher layers decide what to do.  */
-      throw_exception (ex);
+      rethrow_exception ();
     }
   END_CATCH
 }
@@ -12199,7 +12199,7 @@ remote_get_trace_status (struct target_ops *self, struct trace_status *ts)
 	  exception_fprintf (gdb_stderr, ex, "qTStatus: ");
 	  return -1;
 	}
-      throw_exception (ex);
+      rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -3296,7 +3296,7 @@ rs6000_frame_cache (struct frame_info *this_frame, void **this_cache)
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
       return (struct rs6000_frame_cache *) (*this_cache);
     }
   END_CATCH
@@ -3526,7 +3526,7 @@ rs6000_epilogue_frame_cache (struct frame_info *this_frame, void **this_cache)
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/s390-linux-tdep.c
+++ b/gdb/s390-linux-tdep.c
@@ -2359,7 +2359,7 @@ s390_frame_unwind_cache (struct frame_info *this_frame,
   CATCH (const gdb_error &ex)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
-	throw_exception (ex);
+	rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/solib-spu.c
+++ b/gdb/solib-spu.c
@@ -142,7 +142,7 @@ append_ocl_sos (struct so_list **link_ptr)
 		case MEMORY_ERROR:
 		  break;
 		default:
-		  throw_exception (ex);
+		  rethrow_exception ();
 		  break;
 		}
 	    }

--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -2121,16 +2121,16 @@ print_frame_local_vars (struct frame_info *frame, int num_tabs,
 				     do_print_variable_and_value,
 				     &cb_data);
     }
-  CATCH (const gdb_exception &ex)
+  CATCH (gdb_exception &ex)
     {
-      except = ex;
+      except = gdb::move (ex);
     }
   END_CATCH
 
   /* Restore the selected frame, and then rethrow if there was a problem.  */
   select_frame (frame_find_by_id (cb_data.frame_id));
   if (except.reason < 0)
-    throw_exception (except);
+    throw_exception (gdb::move (except));
 
   /* do_print_variable_and_value invalidates FRAME.  */
   frame = NULL;

--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -5520,7 +5520,7 @@ default_make_symbol_completion_list_break_on (const char *text,
   CATCH (const gdb_error &except)
     {
       if (except.error != MAX_COMPLETIONS_REACHED_ERROR)
-	throw_exception (except);
+	rethrow_exception ();
     }
   END_CATCH
 
@@ -5686,7 +5686,7 @@ make_file_symbol_completion_list (const char *text, const char *word,
   CATCH (const gdb_error &except)
     {
       if (except.error != MAX_COMPLETIONS_REACHED_ERROR)
-	throw_exception (except);
+	rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/target.c
+++ b/gdb/target.c
@@ -922,7 +922,7 @@ target_translate_tls_address (struct objfile *objfile, CORE_ADDR offset)
 		       objfile_name (objfile), ex.message);
 	      break;
 	    default:
-	      throw_exception (ex);
+	      rethrow_exception ();
 	      break;
 	    }
 	}

--- a/gdb/tracefile-tfile.c
+++ b/gdb/tracefile-tfile.c
@@ -529,7 +529,7 @@ tfile_open (const char *arg, int from_tty)
     {
       /* Remove the partially set up target.  */
       unpush_target (&tfile_ops);
-      throw_exception (ex);
+      rethrow_exception ();
     }
   END_CATCH
 

--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -3616,7 +3616,7 @@ value_rtti_indirect_type (struct value *v, int *full,
 	         type.  */
 	      return NULL;
 	    }
-	  throw_exception (except);
+	  rethrow_exception ();
 	}
       END_CATCH
     }

--- a/gdb/xml-support.c
+++ b/gdb/xml-support.c
@@ -321,9 +321,9 @@ gdb_xml_start_element_wrapper (void *data, const XML_Char *name,
     {
       gdb_xml_start_element (data, name, attrs);
     }
-  CATCH (const gdb_exception &ex)
+  CATCH (gdb_exception &ex)
     {
-      parser->error = ex;
+      parser->error = gdb::move (ex);
 #ifdef HAVE_XML_STOPPARSER
       XML_StopParser (parser->expat_parser, XML_FALSE);
 #endif
@@ -404,9 +404,9 @@ gdb_xml_end_element_wrapper (void *data, const XML_Char *name)
     {
       gdb_xml_end_element (data, name);
     }
-  CATCH (const gdb_exception &ex)
+  CATCH (gdb_exception &ex)
     {
-      parser->error = ex;
+      parser->error = gdb::move (ex);
 #ifdef HAVE_XML_STOPPARSER
       XML_StopParser (parser->expat_parser, XML_FALSE);
 #endif
@@ -584,7 +584,7 @@ gdb_xml_parse (struct gdb_xml_parser *parser, const char *buffer)
   else
     {
       gdb_assert (parser->error.reason < 0);
-      throw_exception (parser->error);
+      throw_exception (gdb::move (parser->error));
     }
 
   if (parser->last_line != 0)