-/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2020 Free Software Foundation, Inc.
This file is part of GDB.
#include "defs.h"
#include "progspace-and-thread.h"
+#include "inferior.h"
/* See progspace-and-thread.h */
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);
}