From 50fd528a13ff8a6131ead1b2635fa8a8cf828d80 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 28 Nov 2013 15:48:51 +0000 Subject: [PATCH] get_prev_frame, outer_frame_id and unwind->stop_reason checks are redundant. After the previous patch, it should be clear that the this_frame->unwind->stop_reason check is redundant with the outer_frame_id check just below. We can now move the frame_id_eq comparison to the default this_frame->unwind->stop_reason callback. Tested on x86_64 Fedora 17. gdb/ 2013-11-28 Pedro Alves * frame-unwind.c (default_frame_unwind_stop_reason): Return UNWIND_OUTERMOST if the frame's ID is outer_frame_id. * frame.c (get_prev_frame_1): Remove outer_frame_id check. --- gdb/ChangeLog | 6 ++++++ gdb/frame-unwind.c | 10 +++++++--- gdb/frame.c | 15 --------------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2076e5db445..b171f0085e5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2013-11-28 Pedro Alves + + * frame-unwind.c (default_frame_unwind_stop_reason): Return + UNWIND_OUTERMOST if the frame's ID is outer_frame_id. + * frame.c (get_prev_frame_1): Remove outer_frame_id check. + 2013-11-28 Pedro Alves * frame.c (get_prev_frame_1): If the frame id is outer_frame_id, diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c index a731b3387c1..8fabf52c549 100644 --- a/gdb/frame-unwind.c +++ b/gdb/frame-unwind.c @@ -143,14 +143,18 @@ default_frame_sniffer (const struct frame_unwind *self, return 1; } -/* A default frame unwinder stop_reason callback that always claims - the frame is unwindable. */ +/* The default frame unwinder stop_reason callback. */ enum unwind_stop_reason default_frame_unwind_stop_reason (struct frame_info *this_frame, void **this_cache) { - return UNWIND_NO_REASON; + struct frame_id this_id = get_frame_id (this_frame); + + if (frame_id_eq (this_id, outer_frame_id)) + return UNWIND_OUTERMOST; + else + return UNWIND_NO_REASON; } /* Helper functions for value-based register unwinding. These return diff --git a/gdb/frame.c b/gdb/frame.c index 32008acc814..df1d2189d98 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1773,21 +1773,6 @@ get_prev_frame_1 (struct frame_info *this_frame) if (this_frame->stop_reason != UNWIND_NO_REASON) return NULL; - /* Check that this frame is not the outermost. If it is, don't try - to unwind to the prev frame. */ - this_id = get_frame_id (this_frame); - if (frame_id_eq (this_id, outer_frame_id)) - { - if (frame_debug) - { - fprintf_unfiltered (gdb_stdlog, "-> "); - fprint_frame (gdb_stdlog, NULL); - fprintf_unfiltered (gdb_stdlog, " // frame ID is outer_frame_id }\n"); - } - this_frame->stop_reason = UNWIND_OUTERMOST; - return NULL; - } - /* Check that this frame's ID isn't inner to (younger, below, next) the next frame. This happens when a frame unwind goes backwards. This check is valid only if this frame and the next frame are NORMAL. -- 2.30.2