[PATCH] gdb: Fix printing frame when reversing out of a recursive call with clang

[PATCH] gdb: Fix printing frame when reversing out of a recursive call with clang

[Guinevere Larsen]

Commit bf2813aff8f2988ad3d53e819a0415abf295c91f introduced some logic to
not refresh the step frame id if it detects that the inferior is reverse
stepping out of a recursive call, so that we would still print frame
information once the inferior stops.

However, that logic was overly specific, and wouldn't be hit for
inferiors compiled with clang because clang adds line table entries that
aren't statements, making process_event_stop_test go through a different
branch on the relevant if statement.

Fix this by not making the code that detects "reversing out of a
recursion" an else clause to the previous if, but a standalone if block.
---
 gdb/infrun.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 05e81a08e03..f2d28cacd1a 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -8245,7 +8245,8 @@ process_event_stop_test (struct execution_control_state *ecs)
 			       "it's not the start of a statement");
 	}
     }
-  else if (execution_direction == EXEC_REVERSE
+
+  if (execution_direction == EXEC_REVERSE
 	  && *curr_frame_id != original_frame_id
 	  && original_frame_id.code_addr_p && curr_frame_id->code_addr_p
 	  && original_frame_id.code_addr == curr_frame_id->code_addr)
-- 
2.46.0

Re: [PATCH] gdb: Fix printing frame when reversing out of a recursive call with clang

[Kevin Buettner]

On Wed, 14 Aug 2024 13:50:36 -0300
Guinevere Larsen <blarsen@redhat.com> wrote:

> Commit bf2813aff8f2988ad3d53e819a0415abf295c91f introduced some logic to
> not refresh the step frame id if it detects that the inferior is reverse
> stepping out of a recursive call, so that we would still print frame
> information once the inferior stops.
> 
> However, that logic was overly specific, and wouldn't be hit for
> inferiors compiled with clang because clang adds line table entries that
> aren't statements, making process_event_stop_test go through a different
> branch on the relevant if statement.
> 
> Fix this by not making the code that detects "reversing out of a
> recursion" an else clause to the previous if, but a standalone if block.

Approved-by: Kevin Buettner <kevinb@redhat.com>

Re: [PATCH] gdb: Fix printing frame when reversing out of a recursive call with clang

[Guinevere Larsen]

On 8/18/24 3:38 PM, Kevin Buettner wrote:
> On Wed, 14 Aug 2024 13:50:36 -0300
> Guinevere Larsen <blarsen@redhat.com> wrote:
>
>> Commit bf2813aff8f2988ad3d53e819a0415abf295c91f introduced some logic to
>> not refresh the step frame id if it detects that the inferior is reverse
>> stepping out of a recursive call, so that we would still print frame
>> information once the inferior stops.
>>
>> However, that logic was overly specific, and wouldn't be hit for
>> inferiors compiled with clang because clang adds line table entries that
>> aren't statements, making process_event_stop_test go through a different
>> branch on the relevant if statement.
>>
>> Fix this by not making the code that detects "reversing out of a
>> recursion" an else clause to the previous if, but a standalone if block.
> Approved-by: Kevin Buettner <kevinb@redhat.com>
>
Thanks! pushed :)

-- 
Cheers,
Guinevere Larsen
She/Her/Hers