From 0b6e72d4c138e9af09201560c2056658e8b0499e Mon Sep 17 00:00:00 2001 From: Markus Metzger Date: Mon, 11 Aug 2025 14:17:17 +0000 Subject: [PATCH] btrace: update record_btrace_stop_replaying_at_end In record_btrace_stop_replaying_at_end, we know that we are at the end of the execution history, so PC must match the current PC if we're not replaying. We're not changing any other registers during btrace replay, so we should be fine leaving the regcache. But we need to reinit the frame cache, since current frames used the btrace unwinder. The main motivation for this, however, is that future patches extend stop replaying in ways that is not relevant to stop replaying at the end. --- gdb/record-btrace.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 80d22a9b4b6..1af9f49ec60 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -2166,9 +2166,14 @@ record_btrace_stop_replaying_at_end (struct thread_info *tp) return; btrace_insn_end (&end, btinfo); + if (btrace_insn_cmp (replay, &end) != 0) + return; - if (btrace_insn_cmp (replay, &end) == 0) - record_btrace_stop_replaying (tp); + xfree (replay); + btinfo->replay = nullptr; + + /* Discard any frames from the btrace unwinder. */ + reinit_frame_cache (); } /* The resume method of target record-btrace. */ -- 2.47.3