Repository navigation
Commit 2dbcf91
committed
gh-158539: Fix exception mode missing handlers in generators/coroutines
The sampling profiler's exception mode decided whether a thread was
handling an exception by reading the embedded PyThreadState.exc_state.
Generators, coroutines and async generators repoint tstate->exc_info
at their own _PyErr_StackItem while they run, so an except block
running in one of them (or in a function they call) stored the
exception in that item instead, and was never sampled.
Follow tstate->exc_info and its previous_item chain, mirroring
_PyErr_GetTopmostException(), and export the two debug offsets needed
to walk the chain from remote memory. The common case where exc_info
points at the embedded exc_state keeps the existing zero-extra-read
fast path.1 parent a4f28a5 commit 2dbcf91
5 files changed
Lines changed: 466 additions & 10 deletions
File tree
- Include/internal
- Lib/test
- Misc/NEWS.d/next/Library
- Modules/_remote_debugging
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -113,11 +113,13 @@ typedef struct _Py_DebugOffsets { | |||
| 113 | 113 | uint64_t gil_requested; | |
| 114 | 114 | uint64_t current_exception; | |
| 115 | 115 | uint64_t exc_state; | |
| 116 | + uint64_t exc_info; | ||
| 116 | 117 | } thread_state; | |
| 117 | 118 | ||
| 118 | 119 | // Exception stack item offset | |
| 119 | 120 | struct { | |
| 120 | 121 | uint64_t exc_value; | |
| 122 | + uint64_t previous_item; | ||
| 121 | 123 | } err_stackitem; | |
| 122 | 124 | ||
| 123 | 125 | // InterpreterFrame offset; | |
@@ -304,9 +306,11 @@ typedef struct _Py_DebugOffsets { | |||
| 304 | 306 | .gil_requested = offsetof(PyThreadState, gil_requested), \ | |
| 305 | 307 | .current_exception = offsetof(PyThreadState, current_exception), \ | |
| 306 | 308 | .exc_state = offsetof(PyThreadState, exc_state), \ | |
| 309 | + .exc_info = offsetof(PyThreadState, exc_info), \ | ||
| 307 | 310 | }, \ | |
| 308 | 311 | .err_stackitem = { \ | |
| 309 | 312 | .exc_value = offsetof(_PyErr_StackItem, exc_value), \ | |
| 313 | + .previous_item = offsetof(_PyErr_StackItem, previous_item), \ | ||
| 310 | 314 | }, \ | |
| 311 | 315 | .interpreter_frame = { \ | |
| 312 | 316 | .size = sizeof(_PyInterpreterFrame), \ | |
0 commit comments