[v2,2/2] gdb/infrun: simplify process_event_stop_test
Checks
Context |
Check |
Description |
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 |
fail
|
Testing failed
|
linaro-tcwg-bot/tcwg_gdb_build--master-arm |
fail
|
Testing failed
|
linaro-tcwg-bot/tcwg_gdb_check--master-arm |
fail
|
Testing failed
|
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 |
fail
|
Testing failed
|
Commit Message
The previous commit introduced some local variables to make some if
statements simpler. This commit uses them more liberally throughout the
process_event_stop_test in order to simplify the function a little more.
No functional changes are expected.
---
gdb/infrun.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
@@ -7014,9 +7014,7 @@ process_event_stop_test (struct execution_control_state *ecs)
if (init_frame)
{
- struct frame_id current_id
- = get_frame_id (get_current_frame ());
- if (current_id == ecs->event_thread->initiating_frame)
+ if (curr_frame_id == ecs->event_thread->initiating_frame)
{
/* Case 2. Fall through. */
}
@@ -7189,7 +7187,7 @@ process_event_stop_test (struct execution_control_state *ecs)
if (pc_in_thread_step_range (ecs->event_thread->stop_pc (),
ecs->event_thread)
&& (execution_direction != EXEC_REVERSE
- || get_frame_id (frame) == ecs->event_thread->control.step_frame_id))
+ || curr_frame_id == original_frame_id))
{
infrun_debug_printf
("stepping inside range [%s-%s]",
@@ -7619,8 +7617,7 @@ process_event_stop_test (struct execution_control_state *ecs)
frame machinery detected some skipped call sites, we have entered
a new inline function. */
- if ((get_frame_id (get_current_frame ())
- == ecs->event_thread->control.step_frame_id)
+ if ((curr_frame_id == original_frame_id)
&& inline_skipped_frames (ecs->event_thread))
{
infrun_debug_printf ("stepped into inlined function");
@@ -7668,10 +7665,8 @@ process_event_stop_test (struct execution_control_state *ecs)
through a more inlined call beyond its call site. */
if (get_frame_type (get_current_frame ()) == INLINE_FRAME
- && (get_frame_id (get_current_frame ())
- != ecs->event_thread->control.step_frame_id)
- && stepped_in_from (get_current_frame (),
- ecs->event_thread->control.step_frame_id))
+ && (curr_frame_id != original_frame_id)
+ && stepped_in_from (get_current_frame (), original_frame_id))
{
infrun_debug_printf ("stepping through inlined function");
@@ -7701,8 +7696,7 @@ process_event_stop_test (struct execution_control_state *ecs)
end_stepping_range (ecs);
return;
}
- else if (get_frame_id (get_current_frame ())
- == ecs->event_thread->control.step_frame_id)
+ else if (curr_frame_id == original_frame_id)
{
/* We are not at the start of a statement, and we have not changed
frame.