[PATCH v3 21/44] gdb, remote: do 'remote_add_inferior' in 'remote_notice_new_inferior' earlier

[Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>]

In remote_target::remote_notice_new_inferior, we check if the inferior
for the reported ptid exists, and if not, we add that inferior via
'remote_add_inferior'.  However, before adding the new inferior, we
may have already added a new thread, because the thread is not found
via 'in_thread_list'.  This may bring the odd situation that a new
thread is being added before its inferior exists.  Fix this problem by
moving the check and creation of a new inferior to an earlier spot in
the execution flow.

Note that the code has a check for inferior_ptid.is_pid, but this is
not useful to avoid the problem described above because the core
infrun clears inferior_ptid (i.e. sets to null_ptid) before waiting on
targets for stop events.
---
 gdb/remote.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/gdb/remote.c b/gdb/remote.c
index 5a1090d2af191ddb061fa90b55a01d7548e37c07..0b36795436a80d861c3eea389e71bf48da97228d 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -3000,6 +3000,17 @@ remote_target::remote_notice_new_inferior (ptid_t currthread, bool executing)
       struct inferior *inf = NULL;
       int pid = currthread.pid ();
 
+      /* When connecting to a target remote, or to a target
+	 extended-remote which already was debugging an inferior, we
+	 may not know about it yet.  Add it before adding its child
+	 thread, so notifications are emitted in a sensible order.  */
+      if (find_inferior_pid (this, pid) == nullptr)
+	{
+	  bool fake_pid_p = !m_features.remote_multi_process_p ();
+
+	  inf = remote_add_inferior (fake_pid_p, pid, -1, 1);
+	}
+
       if (inferior_ptid.is_pid ()
 	  && pid == inferior_ptid.pid ())
 	{
@@ -3030,18 +3041,6 @@ remote_target::remote_notice_new_inferior (ptid_t currthread, bool executing)
 	  return;
 	}
 
-      /* When connecting to a target remote, or to a target
-	 extended-remote which already was debugging an inferior, we
-	 may not know about it yet.  Add it before adding its child
-	 thread, so notifications are emitted in a sensible order.  */
-      if (find_inferior_pid (this, currthread.pid ()) == NULL)
-	{
-	  bool fake_pid_p = !m_features.remote_multi_process_p ();
-
-	  inf = remote_add_inferior (fake_pid_p,
-				     currthread.pid (), -1, 1);
-	}
-
       /* This is really a new thread.  Add it.  */
       thread_info *new_thr
 	= remote_add_thread (currthread, running, executing, false);

-- 
2.34.1

Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Sean Fennelly, Jeffrey Schneiderman, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928