Skip to content

gh-138661: fix data race in PyCode_Addr2Line #138664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kumaraditya303 merged 5 commits into from
Sep 12, 2025
Merged

gh-138661: fix data race in PyCode_Addr2Line #138664

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
19b6f6d
fix data race in ̌PyCode_Addr2Line
kumaraditya303 Sep 8, 2025
90f0d46
Merge branch 'main' into code
kumaraditya303 Sep 8, 2025
d8d0f02
fix faulthandler
kumaraditya303 Sep 11, 2025
814e5df
fmt
kumaraditya303 Sep 11, 2025
e964d42
fmt
kumaraditya303 Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Objects/codeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,9 +1011,16 @@ PyCode_Addr2Line(PyCodeObject *co, int addrq)
if (addrq < 0) {
return co->co_firstlineno;
}
int lineno = -2; // -1 is a valid line number
Py_BEGIN_CRITICAL_SECTION(co);
if (co->_co_monitoring && co->_co_monitoring->lines) {
return _Py_Instrumentation_GetLine(co, addrq/sizeof(_Py_CODEUNIT));
lineno = _Py_Instrumentation_GetLine(co, addrq/sizeof(_Py_CODEUNIT));
}
Py_END_CRITICAL_SECTION();
if (lineno != -2) {
return lineno;
}

assert(addrq >= 0 && addrq < _PyCode_NBYTES(co));
PyCodeAddressRange bounds;
_PyCode_InitAddressRange(co, &bounds);
Expand Down
Loading