From 9279eb5c2c4421329822186ed86b48faa9d310e6 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 28 Sep 2021 13:13:06 -0600 Subject: [PATCH] Fix Windows crash from stop_pc change The "make thread_suspend_state::stop_pc optional" patch caused a regression on Windows when using shared libraries. I tracked this down to an unguarded use of stop_pc() in the TARGET_WAITKIND_LOADED case of handle_inferior_event. This patch fixes the bug by ensuring that the stop PC is set at this point. --- gdb/infrun.c | 1 + 1 file changed, 1 insertion(+) diff --git a/gdb/infrun.c b/gdb/infrun.c index 5fd1ade7c68..af552e0090b 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -5283,6 +5283,7 @@ handle_inferior_event (struct execution_control_state *ecs) handle_solib_event (); + ecs->event_thread->set_stop_pc (regcache_read_pc (regcache)); ecs->event_thread->control.stop_bpstat = bpstat_stop_status (regcache->aspace (), ecs->event_thread->stop_pc (), -- 2.30.2