[PATCH 3/4] gdb, infrun, record: move no-history notification into normal_stop

[Markus Metzger <markus.t.metzger@intel.com>]

Leave calling gdb::observers::no_history.notify to normal_stop based on
the last waitstatus.

gdb/ChangeLog:
2021-01-15  Markus Metzger  <markus.t.metzger@intel.com>

	* infrun.c (handle_inferior_event): Remove no-history notification.
	(keep_going_pass_signal): Likewise.  Set last waitstatus.
	(normal_stop): Notify no-history observers.
---
 gdb/infrun.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gdb/infrun.c b/gdb/infrun.c
index e79094ad2b2..81e31cf0019 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -5544,8 +5544,6 @@ handle_inferior_event (struct execution_control_state *ecs)
       if (handle_stop_requested (ecs))
 	return;
 
-      gdb::observers::no_history.notify ();
-
       /* Cancel an in-flight step-over.  It will not succeed since we
 	 won't be able to step at the end of the execution history.  */
       finish_step_over (ecs);
@@ -7835,7 +7833,8 @@ keep_going_pass_signal (struct execution_control_state *ecs)
   if (ecs->event_thread->control.is_replaying
       && !target_record_is_replaying (ecs->event_thread->ptid))
     {
-      gdb::observers::no_history.notify ();
+      ecs->ws.kind = TARGET_WAITKIND_NO_HISTORY;
+      target_last_waitstatus = ecs->ws;
       stop_waiting (ecs);
       normal_stop ();
       return;
@@ -8463,6 +8462,9 @@ normal_stop (void)
 	return 1;
     }
 
+  if (last.kind == TARGET_WAITKIND_NO_HISTORY)
+    gdb::observers::no_history.notify ();
+
   /* Notify observers about the stop.  This is where the interpreters
      print the stop event.  */
   if (inferior_ptid != null_ptid)
-- 
2.29.2

Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva  
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928