[PATCH v3 2/3] [gdb] Eliminate local var pspace in inferior.c

[Tom de Vries <tdevries@suse.de>]

Eliminate local var pspace from functions add_inferior_with_spaces and
clone_inferior_command.

This interchanges the order of the new program space / new inferior events.

Update test-case gdb.python/py-progspace-events.exp to reflect that.

Tested on top of trunk on x86_64-linux and ppc64le-linux.
Tested on top of gdb-14-branch on ppc64-linux.

Suggested-By: Simon Marchi <simon.marchi@polymtl.ca>
---
 gdb/inferior.c                                | 20 +++++++------------
 .../gdb.python/py-progspace-events.exp        |  4 ++--
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/gdb/inferior.c b/gdb/inferior.c
index 37b4fad6e44..e0c5567579f 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -843,16 +843,13 @@ remove_inferior_command (const char *args, int from_tty)
 struct inferior *
 add_inferior_with_spaces (void)
 {
-  struct program_space *pspace;
-  struct inferior *inf;
+  struct inferior *inf = add_inferior (0);
 
   /* If all inferiors share an address space on this system, this
      doesn't really return a new address space; otherwise, it
      really does.  */
-  pspace = new program_space (maybe_new_address_space ());
-  inf = add_inferior (0);
-  inf->pspace = pspace;
-  inf->aspace = pspace->aspace;
+  inf->pspace = new program_space (maybe_new_address_space ());
+  inf->aspace = inf->pspace->aspace;
 
   /* Setup the inferior's initial arch, based on information obtained
      from the global "set ..." options.  */
@@ -1012,16 +1009,13 @@ clone_inferior_command (const char *args, int from_tty)
 
   for (i = 0; i < copies; ++i)
     {
-      struct program_space *pspace;
-      struct inferior *inf;
+      struct inferior *inf = add_inferior (0);
 
       /* If all inferiors share an address space on this system, this
 	 doesn't really return a new address space; otherwise, it
 	 really does.  */
-      pspace = new program_space (maybe_new_address_space ());
-      inf = add_inferior (0);
-      inf->pspace = pspace;
-      inf->aspace = pspace->aspace;
+      inf->pspace = new program_space (maybe_new_address_space ());
+      inf->aspace = inf->pspace->aspace;
       inf->set_arch (orginf->arch ());
 
       switch_to_inferior_and_push_target (inf, no_connection, orginf);
@@ -1031,7 +1025,7 @@ clone_inferior_command (const char *args, int from_tty)
       if (inf->tdesc_info.from_user_p ())
 	inf->tdesc_info = orginf->tdesc_info;
 
-      clone_program_space (pspace, orginf->pspace);
+      clone_program_space (inf->pspace, orginf->pspace);
 
       /* Copy properties from the original inferior to the new one.  */
       inf->set_args (orginf->args ());
diff --git a/gdb/testsuite/gdb.python/py-progspace-events.exp b/gdb/testsuite/gdb.python/py-progspace-events.exp
index 60ae290c0b2..fb3e3e86899 100644
--- a/gdb/testsuite/gdb.python/py-progspace-events.exp
+++ b/gdb/testsuite/gdb.python/py-progspace-events.exp
@@ -118,8 +118,8 @@ gdb_continue_to_end
 # manually added and removed.
 gdb_test "add-inferior" \
     [multi_line \
-	 "^NewProgspaceEvent: <gdb.Progspace object at $hex>" \
-	 "\\\[New inferior 3\\\]" \
+	 "^\\\[New inferior 3\\\]" \
+	 "NewProgspaceEvent: <gdb.Progspace object at $hex>" \
 	 "Added inferior 3\[^\r\n\]*"]
 gdb_test "remove-inferior 3" \
     "^FreeProgspaceEvent: <gdb.Progspace object at $hex>"
-- 
2.35.3