Skip to content

Commit

Permalink
gh-123967: Fix faulthandler for trampoline frames (#127329)
Browse files Browse the repository at this point in the history
If the top-most frame is a trampoline frame, skip it.
  • Loading branch information
vstinner authored Nov 27, 2024
1 parent 9328db7 commit 58e334e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix faulthandler for trampoline frames. If the top-most frame is a
trampoline frame, skip it. Patch by Victor Stinner.
23 changes: 14 additions & 9 deletions Python/traceback.c
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,8 @@ _Py_DumpASCII(int fd, PyObject *text)
static void
dump_frame(int fd, _PyInterpreterFrame *frame)
{
assert(frame->owner != FRAME_OWNED_BY_CSTACK);

PyCodeObject *code =_PyFrame_GetCode(frame);
PUTS(fd, " File ");
if (code->co_filename != NULL
Expand Down Expand Up @@ -963,6 +965,17 @@ dump_traceback(int fd, PyThreadState *tstate, int write_header)

unsigned int depth = 0;
while (1) {
if (frame->owner == FRAME_OWNED_BY_CSTACK) {
/* Trampoline frame */
frame = frame->previous;
if (frame == NULL) {
break;
}

/* Can't have more than one shim frame in a row */
assert(frame->owner != FRAME_OWNED_BY_CSTACK);
}

if (MAX_FRAME_DEPTH <= depth) {
if (MAX_FRAME_DEPTH < depth) {
PUTS(fd, "plus ");
Expand All @@ -971,20 +984,12 @@ dump_traceback(int fd, PyThreadState *tstate, int write_header)
}
break;
}

dump_frame(fd, frame);
frame = frame->previous;
if (frame == NULL) {
break;
}
if (frame->owner == FRAME_OWNED_BY_CSTACK) {
/* Trampoline frame */
frame = frame->previous;
}
if (frame == NULL) {
break;
}
/* Can't have more than one shim frame in a row */
assert(frame->owner != FRAME_OWNED_BY_CSTACK);
depth++;
}
}
Expand Down

0 comments on commit 58e334e

Please sign in to comment.