From 2646bfa763e890c41474206344e3b02e1648c765 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Tue, 2 May 2023 11:35:36 -0400
Subject: [PATCH] gdb: add interp::on_inferior_removed method

Same idea as previous patches, but for inferior_removed.

Change-Id: I7971840bbbdcfabf77e2ded7584830c9dfdd10d0
---
 gdb/inferior.c     | 11 ++++++++++-
 gdb/interps.c      |  8 ++++++++
 gdb/interps.h      |  6 ++++++
 gdb/mi/mi-interp.c | 24 ++++++------------------
 gdb/mi/mi-interp.h |  1 +
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/gdb/inferior.c b/gdb/inferior.c
index 32fe9ccbd65..eee4785fbf7 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -260,6 +260,15 @@ inferior::clear_thread_list (bool silent)
   ptid_thread_map.clear ();
 }
 
+/* Notify interpreters and observers that inferior INF was removed.  */
+
+static void
+notify_inferior_removed (inferior *inf)
+{
+  interps_notify_inferior_removed (inf);
+  gdb::observers::inferior_removed.notify (inf);
+}
+
 void
 delete_inferior (struct inferior *inf)
 {
@@ -268,7 +277,7 @@ delete_inferior (struct inferior *inf)
   auto it = inferior_list.iterator_to (*inf);
   inferior_list.erase (it);
 
-  gdb::observers::inferior_removed.notify (inf);
+  notify_inferior_removed (inf);
 
   /* Pop all targets now, this ensures that inferior::unpush is called
      correctly.  As pop_all_targets ends up making a temporary switch to
diff --git a/gdb/interps.c b/gdb/interps.c
index 46b0ecbd73f..1bcc33c2a8c 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -486,6 +486,14 @@ interps_notify_inferior_disappeared (inferior *inf)
   interps_notify (&interp::on_inferior_disappeared, inf);
 }
 
+/* See interps.h.  */
+
+void
+interps_notify_inferior_removed (inferior *inf)
+{
+  interps_notify (&interp::on_inferior_removed, inf);
+}
+
 /* This just adds the "interpreter-exec" command.  */
 void _initialize_interpreter ();
 void
diff --git a/gdb/interps.h b/gdb/interps.h
index b1aee5db829..ad351bbf807 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -131,6 +131,9 @@ public:
   /* Notify the interpreter that inferior INF exited or was detached.  */
   virtual void on_inferior_disappeared (inferior *inf) {}
 
+  /* Notify the interpreter that inferior INF was removed.  */
+  virtual void on_inferior_removed (inferior *inf) {}
+
 private:
   /* The memory for this is static, it comes from literal strings (e.g. "cli").  */
   const char *m_name;
@@ -257,6 +260,9 @@ extern void interps_notify_inferior_appeared (inferior *inf);
 /* Notify all interpreters that inferior INF exited or was detached.  */
 extern void interps_notify_inferior_disappeared (inferior *inf);
 
+/* Notify all interpreters that inferior INF was removed.  */
+extern void interps_notify_inferior_removed (inferior *inf);
+
 /* well-known interpreters */
 #define INTERP_CONSOLE		"console"
 #define INTERP_MI2             "mi2"
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index ad934d337e5..c2185ef5435 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -62,7 +62,6 @@ static void mi_remove_notify_hooks (void);
 
 static void mi_record_changed (struct inferior*, int, const char *,
 			       const char *);
-static void mi_inferior_removed (struct inferior *inf);
 static void mi_on_resume (ptid_t ptid);
 static void mi_solib_loaded (struct so_list *solib);
 static void mi_solib_unloaded (struct so_list *solib);
@@ -395,24 +394,14 @@ mi_interp::on_inferior_disappeared (inferior *inf)
   gdb_flush (this->event_channel);
 }
 
-static void
-mi_inferior_removed (struct inferior *inf)
+void
+mi_interp::on_inferior_removed (inferior *inf)
 {
-  SWITCH_THRU_ALL_UIS ()
-    {
-      struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
-      if (mi == NULL)
-	continue;
-
-      target_terminal::scoped_restore_terminal_state term_state;
-      target_terminal::ours_for_output ();
+  target_terminal::scoped_restore_terminal_state term_state;
+  target_terminal::ours_for_output ();
 
-      gdb_printf (mi->event_channel,
-		  "thread-group-removed,id=\"i%d\"",
-		  inf->num);
-      gdb_flush (mi->event_channel);
-    }
+  gdb_printf (this->event_channel, "thread-group-removed,id=\"i%d\"", inf->num);
+  gdb_flush (this->event_channel);
 }
 
 /* Observers for several run control events that print why the
@@ -1121,7 +1110,6 @@ _initialize_mi_interp ()
   interp_factory_register (INTERP_MI4, mi_interp_factory);
   interp_factory_register (INTERP_MI, mi_interp_factory);
 
-  gdb::observers::inferior_removed.attach (mi_inferior_removed, "mi-interp");
   gdb::observers::record_changed.attach (mi_record_changed, "mi-interp");
   gdb::observers::target_resumed.attach (mi_on_resume, "mi-interp");
   gdb::observers::solib_loaded.attach (mi_solib_loaded, "mi-interp");
diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h
index 66c55855230..0e8804d449e 100644
--- a/gdb/mi/mi-interp.h
+++ b/gdb/mi/mi-interp.h
@@ -55,6 +55,7 @@ public:
   void on_inferior_added (inferior *inf) override;
   void on_inferior_appeared (inferior *inf) override;
   void on_inferior_disappeared (inferior *inf) override;
+  void on_inferior_removed (inferior *inf) override;
 
   /* MI's output channels */
   mi_console_file *out;
-- 
2.30.2