Commitf4c9f39

authored

[3.12]gh-123967: Fix faulthandler for trampoline frames (#127329) (#127363)

gh-123967: Fix faulthandler for trampoline frames (#127329)If the top-most frame is a trampoline frame, skip it.(cherry picked from commit58e334e)

1 parentc3bb32d commitf4c9f39Copy full SHA for f4c9f39

File tree

+16

-9

lines changed

+16

-9

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix faulthandler for trampoline frames. If the top-most frame is a`
	`2`	`+trampoline frame, skip it. Patch by Victor Stinner.`

Lines changed: 14 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1242,6 +1242,8 @@ _Py_DumpASCII(int fd, PyObject *text)`
`1242`	`1242`	`staticvoid`
`1243`	`1243`	`dump_frame(intfd,_PyInterpreterFrame*frame)`
`1244`	`1244`	`{`
	`1245`	`+assert(frame->owner!=FRAME_OWNED_BY_CSTACK);`
	`1246`	`+`
`1245`	`1247`	`PyCodeObject*code=frame->f_code;`
`1246`	`1248`	`PUTS(fd," File ");`
`1247`	`1249`	`if (code->co_filename!=NULL`
`@@ -1315,24 +1317,27 @@ dump_traceback(int fd, PyThreadState *tstate, int write_header)`
`1315`	`1317`
`1316`	`1318`	`unsignedintdepth=0;`
`1317`	`1319`	`while (1) {`
	`1320`	`+if (frame->owner==FRAME_OWNED_BY_CSTACK) {`
	`1321`	`+/* Trampoline frame */`
	`1322`	`+frame=frame->previous;`
	`1323`	`+if (frame==NULL) {`
	`1324`	`+break;`
	`1325`	`+ }`
	`1326`	`+`
	`1327`	`+/* Can't have more than one shim frame in a row */`
	`1328`	`+assert(frame->owner!=FRAME_OWNED_BY_CSTACK);`
	`1329`	`+ }`
	`1330`	`+`
`1318`	`1331`	`if (MAX_FRAME_DEPTH <=depth) {`
`1319`	`1332`	`PUTS(fd," ...\n");`
`1320`	`1333`	`break;`
`1321`	`1334`	`}`
	`1335`	`+`
`1322`	`1336`	`dump_frame(fd,frame);`
`1323`	`1337`	`frame=frame->previous;`
`1324`	`1338`	`if (frame==NULL) {`
`1325`	`1339`	`break;`
`1326`	`1340`	`}`
`1327`		`-if (frame->owner==FRAME_OWNED_BY_CSTACK) {`
`1328`		`-/* Trampoline frame */`
`1329`		`-frame=frame->previous;`
`1330`		`- }`
`1331`		`-if (frame==NULL) {`
`1332`		`-break;`
`1333`		`- }`
`1334`		`-/* Can't have more than one shim frame in a row */`
`1335`		`-assert(frame->owner!=FRAME_OWNED_BY_CSTACK);`
`1336`	`1341`	`depth++;`
`1337`	`1342`	`}`
`1338`	`1343`	`}`

Comments

(0)