From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 13 Jun 2026 23:40:19 +0000 (+0200)
Subject: [3.15] gh-151424: Fix impossible stack traces in `RemoteUnwinder(..., cache_frames... 
X-Git-Tag: v3.15.0b3~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75289a92dfb460acde427b9f399881a108427b6c;p=thirdparty%2FPython%2Fcpython.git

[3.15] gh-151424: Fix impossible stack traces in `RemoteUnwinder(..., cache_frames=True)` by copying chunks on cache miss (GH-151426) (#151459)

gh-151424: Fix impossible stack traces in `RemoteUnwinder(..., cache_frames=True)` by copying chunks on cache miss (GH-151426)
(cherry picked from commit 6ce088e20a13ac25320d94c5775bb1a4edc75ba4)

Co-authored-by: Maurycy Pawłowski-Wieroński <maurycy@maurycy.com>
---

diff --git a/Misc/NEWS.d/next/Library/2026-06-13-04-11-00.gh-issue-151426.f2V67e.rst b/Misc/NEWS.d/next/Library/2026-06-13-04-11-00.gh-issue-151426.f2V67e.rst
new file mode 100644
index 000000000000..428302e5f847
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2026-06-13-04-11-00.gh-issue-151426.f2V67e.rst
@@ -0,0 +1,4 @@
+Fix impossible stack traces (callers and callees cross called, orphans and
+incorrect lines) in the Tachyon profiler when caching frames, by snapshotting
+the stack chunks before walking the frame chain on a cache miss. Patch by
+Maurycy Pawłowski-Wieroński.
diff --git a/Modules/_remote_debugging/frames.c b/Modules/_remote_debugging/frames.c
index d73cd080dc47..e7d2a2764390 100644
--- a/Modules/_remote_debugging/frames.c
+++ b/Modules/_remote_debugging/frames.c
@@ -580,6 +580,14 @@ collect_frames_with_cache(
         return full_hit < 0 ? -1 : 0;
     }
 
+    assert(ctx->chunks != NULL);
+
+    if (ctx->chunks->count == 0) {
+        if (copy_stack_chunks(unwinder, ctx->thread_state_addr, ctx->chunks) < 0) {
+            PyErr_Clear();
+        }
+    }
+
     Py_ssize_t frames_before = PyList_GET_SIZE(ctx->frame_info);
 
     if (process_frame_chain(unwinder, ctx) < 0) {