From: Guinevere Larsen <blarsen@redhat.com>
To: gdb-patches@sourceware.org
Cc: kevinb@redhat.com, Guinevere Larsen <blarsen@redhat.com>
Subject: [PATCH v3 2/2] gdb/infrun: simplify process_event_stop_test
Date: Wed, 27 Sep 2023 12:19:52 +0200 [thread overview]
Message-ID: <20230927101950.1913970-5-blarsen@redhat.com> (raw)
In-Reply-To: <20230927101950.1913970-3-blarsen@redhat.com>
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(-)
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 3491327422d..71e52e230d5 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -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.
--
2.41.0
prev parent reply other threads:[~2023-09-27 10:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-27 10:19 [PATCH v3 0/2] Improving frame printing with recursive Guinevere Larsen
2023-09-27 10:19 ` [PATCH v3 1/2] gdb/record: print frame information when exiting a recursive call Guinevere Larsen
2023-09-27 21:26 ` Kevin Buettner
2023-09-27 23:22 ` Kevin Buettner
2023-09-28 1:57 ` Kevin Buettner
2023-10-02 13:11 ` Guinevere Larsen
2023-09-27 10:19 ` Guinevere Larsen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230927101950.1913970-5-blarsen@redhat.com \
--to=blarsen@redhat.com \
--cc=gdb-patches@sourceware.org \
--cc=kevinb@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).