diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/infrun.c | 16 |
2 files changed, 16 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 692bb5a..edb60f7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -2,6 +2,14 @@ Stephen Roberts <stephen.roberts@arm.com> PR gdb/22882 + * infrun.c (fetch_inferior_event): If GDB is not proceeding then + run INF_EXEC_COMPLETE handler, even when not calling normal_stop. + Move should_notify_stop local into more inner scope. + +2018-06-12 Andrew Burgess <andrew.burgess@embecosm.com> + Stephen Roberts <stephen.roberts@arm.com> + + PR gdb/22882 * infrun.c (resume_1): Add call to mark_async_event_handler. 2018-06-12 Andrew Burgess <andrew.burgess@embecosm.com> diff --git a/gdb/infrun.c b/gdb/infrun.c index 6f5338c..f455af2 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3932,7 +3932,6 @@ fetch_inferior_event (void *client_data) struct inferior *inf = find_inferior_ptid (ecs->ptid); int should_stop = 1; struct thread_info *thr = ecs->event_thread; - int should_notify_stop = 1; delete_just_stopped_threads_infrun_breakpoints (); @@ -3950,6 +3949,9 @@ fetch_inferior_event (void *client_data) } else { + int should_notify_stop = 1; + int proceeded = 0; + clean_up_just_stopped_threads_fsms (ecs); if (thr != NULL && thr->thread_fsm != NULL) @@ -3960,17 +3962,15 @@ fetch_inferior_event (void *client_data) if (should_notify_stop) { - int proceeded = 0; - /* We may not find an inferior if this was a process exit. */ if (inf == NULL || inf->control.stop_soon == NO_STOP_QUIETLY) proceeded = normal_stop (); + } - if (!proceeded) - { - inferior_event_handler (INF_EXEC_COMPLETE, NULL); - cmd_done = 1; - } + if (!proceeded) + { + inferior_event_handler (INF_EXEC_COMPLETE, NULL); + cmd_done = 1; } } } |