gdb: include gdbsupport/buildargv.h in ser-mingw.c

[binutils-gdb.git] / gdb / progspace-and-thread.c

diff --git a/gdb/progspace-and-thread.c b/gdb/progspace-and-thread.c
index 27d626b05f8c26a2c5bcc16d5df55ccaa2643fa7..948183d4cce7922d5ea2c118e69e7b848f3a44ba 100644 (file)
--- a/gdb/progspace-and-thread.c
+++ b/gdb/progspace-and-thread.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2022 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,6 +17,7 @@
 
 #include "defs.h"
 #include "progspace-and-thread.h"
+#include "inferior.h"
 
 /* See progspace-and-thread.h  */
 
@@ -24,20 +25,20 @@ void
 switch_to_program_space_and_thread (program_space *pspace)
 {
   inferior *inf = find_inferior_for_program_space (pspace);
+  gdb_assert (inf != nullptr);
 
-  if (inf != NULL && inf->pid != 0)
+  if (inf->pid != 0)
     {
-      thread_info *tp = any_live_thread_of_process (inf->pid);
+      thread_info *tp = any_live_thread_of_inferior (inf);
 
       if (tp != NULL)
        {
-         switch_to_thread (tp->ptid);
+         switch_to_thread (tp);
          /* Switching thread switches pspace implicitly.  We're
             done.  */
          return;
        }
     }
 
-  switch_to_thread (null_ptid);
-  set_current_program_space (pspace);
+  switch_to_inferior_no_thread (inf);
 }