From c17eaafea78b9fef73ab2ec654812c8a1f31987a Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Sat, 19 Aug 2006 03:19:00 +0000 Subject: [PATCH] * infrun.c (handle_inferior_event): Check the current frame ID before unwinding to the previous frame. --- gdb/ChangeLog | 5 +++++ gdb/infrun.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 226077be874..908e7e48446 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2006-08-18 Daniel Jacobowitz + + * infrun.c (handle_inferior_event): Check the current frame ID + before unwinding to the previous frame. + 2006-08-18 Daniel Jacobowitz * dwarf2read.c (quirk_gcc_member_function_pointer): Add GCC PR diff --git a/gdb/infrun.c b/gdb/infrun.c index de976367bf9..1c31a846bb4 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -2368,12 +2368,16 @@ process_event_stop_test: return; } - /* Check for subroutine calls. + /* Check for subroutine calls. The check for the current frame + equalling the step ID is not necessary - the check of the + previous frame's ID is sufficient - but it is a common case and + cheaper than checking the previous frame's ID. NOTE: frame_id_eq will never report two invalid frame IDs as being equal, so to get into this block, both the current and previous frame must have valid frame IDs. */ - if (frame_id_eq (frame_unwind_id (get_current_frame ()), step_frame_id)) + if (!frame_id_eq (get_frame_id (get_current_frame ()), step_frame_id) + && frame_id_eq (frame_unwind_id (get_current_frame ()), step_frame_id)) { CORE_ADDR real_stop_pc; -- 2.30.2