diff options
| author | Tom Tromey <tom@tromey.com> | 2017-10-08 12:40:07 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-10-08 23:16:42 -0600 |
| commit | 30a9c02feff56bd58a276c2a7262f364baa558ac (patch) | |
| tree | 653735bbd531718449106195009cede65ffa1a0b /gdb/frame-unwind.c | |
| parent | 757325a3f24e01bf8e7b7214f33c546bc52d1d12 (diff) | |
| download | gdb-30a9c02feff56bd58a276c2a7262f364baa558ac.zip gdb-30a9c02feff56bd58a276c2a7262f364baa558ac.tar.gz gdb-30a9c02feff56bd58a276c2a7262f364baa558ac.tar.bz2 | |
Remove cleanup from frame_prepare_for_sniffer
Currently frame_prepare_for_sniffer returns a cleanup. This patch
changes it to return void, and exposes frame_cleanup_after_sniffer to
the caller.
Normally I would write an RAII class for this sort of thing; but
because there was just a single caller of frame_prepare_for_sniffer,
and because this caller is already using try/catch, I thought it
seemed ok to require explicit calls in this instance.
Regression tested by the buildbot.
gdb/ChangeLog
2017-10-08 Tom Tromey <tom@tromey.com>
* frame-unwind.c (frame_unwind_try_unwinder): Update.
* frame.h (frame_cleanup_after_sniffer): Declare.
(frame_prepare_for_sniffer): Return void.
* frame.c (frame_cleanup_after_sniffer): No longer static. Change
type of argument.
(frame_prepare_for_sniffer): Return void.
Diffstat (limited to 'gdb/frame-unwind.c')
| -rw-r--r-- | gdb/frame-unwind.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c index 096631c..ede226a 100644 --- a/gdb/frame-unwind.c +++ b/gdb/frame-unwind.c @@ -97,10 +97,9 @@ static int frame_unwind_try_unwinder (struct frame_info *this_frame, void **this_cache, const struct frame_unwind *unwinder) { - struct cleanup *old_cleanup; int res = 0; - old_cleanup = frame_prepare_for_sniffer (this_frame, unwinder); + frame_prepare_for_sniffer (this_frame, unwinder); TRY { @@ -117,7 +116,7 @@ frame_unwind_try_unwinder (struct frame_info *this_frame, void **this_cache, thus most unwinders aren't able to determine if they're the best fit. Keep trying. Fallback prologue unwinders should always accept the frame. */ - do_cleanups (old_cleanup); + frame_cleanup_after_sniffer (this_frame); return 0; } throw_exception (ex); @@ -125,15 +124,12 @@ frame_unwind_try_unwinder (struct frame_info *this_frame, void **this_cache, END_CATCH if (res) - { - discard_cleanups (old_cleanup); - return 1; - } + return 1; else { /* Don't set *THIS_CACHE to NULL here, because sniffer has to do so. */ - do_cleanups (old_cleanup); + frame_cleanup_after_sniffer (this_frame); return 0; } gdb_assert_not_reached ("frame_unwind_try_unwinder"); |