From a0776b131d7a154125fdc4d22b1dda967c790ae9 Mon Sep 17 00:00:00 2001
From: Pedro Alves <palves@redhat.com>
Date: Jun 18 2020 22:04:50 +0000
Subject: Don't write to inferior_ptid in target.c


gdb/ChangeLog:
2020-06-18  Pedro Alves  <palves@redhat.com>

	* target.c (generic_mourn_inferior): Use switch_to_no_thread
	instead of writing to inferior_ptid.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4bc9c28..2890b1f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2020-06-18  Pedro Alves  <palves@redhat.com>
 
+	* target.c (generic_mourn_inferior): Use switch_to_no_thread
+	instead of writing to inferior_ptid.
+
+2020-06-18  Pedro Alves  <palves@redhat.com>
+
 	* inf-ptrace.c (inf_ptrace_target::create_inferior): Switch to the
 	added thread.
 	(inf_ptrace_target::attach): Don't write to inferior_ptid.  Switch
diff --git a/gdb/target.c b/gdb/target.c
index e8193b4..f4e4f05 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -3108,7 +3108,7 @@ generic_mourn_inferior (void)
 {
   inferior *inf = current_inferior ();
 
-  inferior_ptid = null_ptid;
+  switch_to_no_thread ();
 
   /* Mark breakpoints uninserted in case something tries to delete a
      breakpoint while we delete the inferior's threads (which would