diff options
| author | Keith Seitz <keiths@redhat.com> | 2017-10-27 13:17:21 -0700 |
|---|---|---|
| committer | Keith Seitz <keiths@redhat.com> | 2017-11-28 13:23:10 -0800 |
| commit | a62f06ebb31ac243450bf17b07b8892517e9a981 (patch) | |
| tree | 2613c8cf49e3bcf0e4d05cbeb1e657f0c424a8cf /gdb/infrun.c | |
| parent | 83b9557361c2d79479e17d5967f5180c371fa138 (diff) | |
| download | gdb-users/keiths/inline-func-bp-for-pedro.zip gdb-users/keiths/inline-func-bp-for-pedro.tar.gz gdb-users/keiths/inline-func-bp-for-pedro.tar.bz2 | |
More minimal patchusers/keiths/inline-func-bp-for-pedro
Same thing but using the exception, leaving bpstat_stop_status call
where it is.
This and the previous commit are intended to be exported to an stgit branch,
where one can easily switch between the two approaches by push/pop'ing
patches. Diffing against origin/master will therefore always give a complete
patch sans busywork.
Diffstat (limited to 'gdb/infrun.c')
| -rw-r--r-- | gdb/infrun.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c index 2b14024..db6fd4e 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -5839,7 +5839,12 @@ handle_signal_stop (struct execution_control_state *ecs) ecs->event_thread->control.stop_step = 0; stop_print_frame = 1; stopped_by_random_signal = 0; - bpstat stop_chain = NULL; + + /* See if there is a breakpoint/watchpoint/catchpoint/etc. that + handles this event. */ + ecs->event_thread->control.stop_bpstat + = bpstat_stop_status (get_current_regcache ()->aspace (), + stop_pc, ecs->ptid, &ecs->ws); /* Hide inlined functions starting here, unless we just performed stepi or nexti. After stepi and nexti, always show the innermost frame (not any @@ -5873,9 +5878,8 @@ handle_signal_stop (struct execution_control_state *ecs) { struct breakpoint *bpt = NULL; - stop_chain = build_bpstat_chain (aspace, stop_pc, &ecs->ws); - if (stop_chain != NULL) - bpt = stop_chain->breakpoint_at; + if (ecs->event_thread->control.stop_bpstat != NULL) + bpt = ecs->event_thread->control.stop_bpstat->breakpoint_at; skip_inline_frames (ecs->ptid, bpt); @@ -5922,12 +5926,6 @@ handle_signal_stop (struct execution_control_state *ecs) } } - /* See if there is a breakpoint/watchpoint/catchpoint/etc. that - handles this event. */ - ecs->event_thread->control.stop_bpstat - = bpstat_stop_status (get_current_regcache ()->aspace (), - stop_pc, ecs->ptid, &ecs->ws, stop_chain); - /* Following in case break condition called a function. */ stop_print_frame = 1; |