* progspace.c (save_current_space_and_thread): Remove unnecessary

	call to save_current_inferior.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a8bc3cb99f62062089c184e988d87fe4e3376e70..d5244c6358b9581e3951dd802608d8389de7c6d6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-04  Doug Evans  <dje@google.com>
+
+       * progspace.c (save_current_space_and_thread): Remove unnecessary
+       call to save_current_inferior.
+
 2013-09-04  Andrew Burgess  <aburgess@broadcom.com>
 
        * sh64-tdep.c (sh64_do_register): Return after printing message

diff --git a/gdb/progspace.c b/gdb/progspace.c
index 52460ab84f87364c3cf9735875edde47bce64371..2a031ed4f9e75bb9bf7e3b77c5d2760575c93e8a 100644 (file)
--- a/gdb/progspace.c
+++ b/gdb/progspace.c
@@ -471,7 +471,8 @@ save_current_space_and_thread (void)
   /* If restoring to null thread, we need to restore the pspace as
      well, hence, we need to save the current program space first.  */
   old_chain = save_current_program_space ();
-  save_current_inferior ();
+  /* There's no need to save the current inferior here.
+     That is handled by make_cleanup_restore_current_thread.  */
   make_cleanup_restore_current_thread ();
 
   return old_chain;