OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use TRY/CATCH in remove_prev_frame

Browse Source 
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  <tom@tromey.com>

	* frame.c (remove_prev_frame): Remove.
	(get_prev_frame_if_no_cycle): Use TRY/CATCH.
This commit is contained in:
Tom Tromey 2018-05-24 18:23:37 -06:00
parent d8dab6c3bb
commit 09a5e1b570
2 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2018-05-25 Tom Tromey <tom@tromey.com>
* frame.c (remove_prev_frame): Remove.
(get_prev_frame_if_no_cycle): Use TRY/CATCH.
2018-05-25 Maciej W. Rozycki <macro@mips.com>
* mips-linux-tdep.h (mips_supply_fpregset, mips_fill_fpregset):

57
gdb/frame.c
View File

@ -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;
}
discard_cleanups (prev_frame_cleanup);
throw_exception (ex);
}
END_CATCH
return prev_frame;
}