projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Guard against 'current_directory == NULL' on gdb_abspath (PR gdb/23613)
[deliverable/binutils-gdb.git]
/
gdb
/
dummy-frame.c
diff --git
a/gdb/dummy-frame.c
b/gdb/dummy-frame.c
index aebdd233d74074fb1f723c7bd0bd9e03147e24db..3b76d456b7b134b5d524263898278ca98ff0b380 100644
(file)
--- a/
gdb/dummy-frame.c
+++ b/
gdb/dummy-frame.c
@@
-29,6
+29,7
@@
#include "observable.h"
#include "gdbthread.h"
#include "infcall.h"
#include "observable.h"
#include "gdbthread.h"
#include "infcall.h"
+#include "gdbarch.h"
struct dummy_frame_id
{
struct dummy_frame_id
{
@@
-125,11
+126,9
@@
remove_dummy_frame (struct dummy_frame **dummy_ptr)
/* Delete any breakpoint B which is a momentary breakpoint for return from
inferior call matching DUMMY_VOIDP. */
/* Delete any breakpoint B which is a momentary breakpoint for return from
inferior call matching DUMMY_VOIDP. */
-static
int
-pop_dummy_frame_bpt (struct breakpoint *b,
void *dummy_voidp
)
+static
bool
+pop_dummy_frame_bpt (struct breakpoint *b,
struct dummy_frame *dummy
)
{
{
- struct dummy_frame *dummy = (struct dummy_frame *) dummy_voidp;
-
if (b->thread == dummy->id.thread->global_num
&& b->disposition == disp_del && frame_id_eq (b->frame_id, dummy->id.id))
{
if (b->thread == dummy->id.thread->global_num
&& b->disposition == disp_del && frame_id_eq (b->frame_id, dummy->id.id))
{
@@
-139,11
+138,11
@@
pop_dummy_frame_bpt (struct breakpoint *b, void *dummy_voidp)
delete_breakpoint (b);
/* Stop the traversal. */
delete_breakpoint (b);
/* Stop the traversal. */
- return
1
;
+ return
true
;
}
/* Continue the traversal. */
}
/* Continue the traversal. */
- return
0
;
+ return
false
;
}
/* Pop *DUMMY_PTR, restoring program state to that before the
}
/* Pop *DUMMY_PTR, restoring program state to that before the
@@
-167,7
+166,10
@@
pop_dummy_frame (struct dummy_frame **dummy_ptr)
restore_infcall_suspend_state (dummy->caller_state);
restore_infcall_suspend_state (dummy->caller_state);
- iterate_over_breakpoints (pop_dummy_frame_bpt, dummy);
+ iterate_over_breakpoints ([dummy] (breakpoint* bp)
+ {
+ return pop_dummy_frame_bpt (bp, dummy);
+ });
/* restore_infcall_control_state frees inf_state,
all that remains is to pop *dummy_ptr. */
/* restore_infcall_control_state frees inf_state,
all that remains is to pop *dummy_ptr. */
This page took
0.025672 seconds
and
4
git commands to generate.