From 09a5e1b570eefbc029939fd43c99152996060d95 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 24 May 2018 18:23:37 -0600 Subject: [PATCH] Use TRY/CATCH in remove_prev_frame This changes remove_prev_frame to use TRY/CATCH instead of a cleanup. TRY/CATCH seemed appropriate here because the cleanup is only needed in the case where an exception is thrown. Tested by the buildbot. ChangeLog 2018-05-25 Tom Tromey * frame.c (remove_prev_frame): Remove. (get_prev_frame_if_no_cycle): Use TRY/CATCH. --- gdb/ChangeLog | 5 +++++ gdb/frame.c | 55 +++++++++++++++++++++------------------------------ 2 files changed, 27 insertions(+), 33 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 070c991f84f..863fbaea004 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2018-05-25 Tom Tromey + + * frame.c (remove_prev_frame): Remove. + (get_prev_frame_if_no_cycle): Use TRY/CATCH. + 2018-05-25 Maciej W. Rozycki * mips-linux-tdep.h (mips_supply_fpregset, mips_fill_fpregset): diff --git a/gdb/frame.c b/gdb/frame.c index 1d0eb725145..c0f6e64dfc2 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1871,22 +1871,6 @@ frame_register_unwind_location (struct frame_info *this_frame, int regnum, } } -/* Called during frame unwinding to remove a previous frame pointer from a - frame passed in ARG. */ - -static void -remove_prev_frame (void *arg) -{ - struct frame_info *this_frame, *prev_frame; - - this_frame = (struct frame_info *) arg; - prev_frame = this_frame->prev; - gdb_assert (prev_frame != NULL); - - prev_frame->next = NULL; - this_frame->prev = NULL; -} - /* Get the previous raw frame, and check that it is not identical to same other frame frame already in the chain. If it is, there is most likely a stack cycle, so we discard it, and mark THIS_FRAME as @@ -1899,7 +1883,6 @@ static struct frame_info * get_prev_frame_if_no_cycle (struct frame_info *this_frame) { struct frame_info *prev_frame; - struct cleanup *prev_frame_cleanup; prev_frame = get_prev_frame_raw (this_frame); @@ -1915,29 +1898,35 @@ get_prev_frame_if_no_cycle (struct frame_info *this_frame) if (prev_frame->level == 0) return prev_frame; - /* The cleanup will remove the previous frame that get_prev_frame_raw - linked onto THIS_FRAME. */ - prev_frame_cleanup = make_cleanup (remove_prev_frame, this_frame); - - compute_frame_id (prev_frame); - if (!frame_stash_add (prev_frame)) + TRY { - /* Another frame with the same id was already in the stash. We just - detected a cycle. */ - if (frame_debug) + compute_frame_id (prev_frame); + if (!frame_stash_add (prev_frame)) { - fprintf_unfiltered (gdb_stdlog, "-> "); - fprint_frame (gdb_stdlog, NULL); - fprintf_unfiltered (gdb_stdlog, " // this frame has same ID }\n"); + /* Another frame with the same id was already in the stash. We just + detected a cycle. */ + if (frame_debug) + { + fprintf_unfiltered (gdb_stdlog, "-> "); + fprint_frame (gdb_stdlog, NULL); + fprintf_unfiltered (gdb_stdlog, " // this frame has same ID }\n"); + } + this_frame->stop_reason = UNWIND_SAME_ID; + /* Unlink. */ + prev_frame->next = NULL; + this_frame->prev = NULL; + prev_frame = NULL; } - this_frame->stop_reason = UNWIND_SAME_ID; - /* Unlink. */ + } + CATCH (ex, RETURN_MASK_ALL) + { prev_frame->next = NULL; this_frame->prev = NULL; - prev_frame = NULL; + + throw_exception (ex); } + END_CATCH - discard_cleanups (prev_frame_cleanup); return prev_frame; } -- 2.30.2