Skip to content

gh-129069: fix TSAN-0013 from gh-153852 #154516

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

Open
xxyzz wants to merge 2 commits into
base: main
Choose a base branch
from
+15 −5
Open

gh-129069: fix TSAN-0013 from gh-153852 #154516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb9567a
gh-129069: use atomic read in `_Py_SIZE_impl()`
xxyzz Jul 22, 2026
786ad9f
gh-129069: use atomic `_PyList_GetItemRef` in `stringlib_bytes_join`
xxyzz Jul 23, 2026
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
4 changes: 0 additions & 4 deletions Include/cpython/listobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ typedef struct {

static inline Py_ssize_t PyList_GET_SIZE(PyObject *op) {
PyListObject *list = _PyList_CAST(op);
#ifdef Py_GIL_DISABLED
return _Py_atomic_load_ssize_relaxed(&(_PyVarObject_CAST(list)->ob_size));
#else
return Py_SIZE(list);
#endif
}
#define PyList_GET_SIZE(op) PyList_GET_SIZE(_PyObject_CAST(op))

Expand Down
6 changes: 5 additions & 1 deletion Include/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,11 @@ _Py_SIZE_impl(PyObject *ob)
{
assert(Py_TYPE(ob) != &PyLong_Type);
assert(Py_TYPE(ob) != &PyBool_Type);
return _PyVarObject_CAST(ob)->ob_size;
#ifdef Py_GIL_DISABLED
return _Py_atomic_load_ssize_relaxed(&(_PyVarObject_CAST(ob)->ob_size));
#else
return _PyVarObject_CAST(ob)->ob_size;
#endif
}

static inline int
Expand Down
1 change: 1 addition & 0 deletions Objects/bytearrayobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "pycore_object.h" // _PyObject_GC_UNTRACK()
#include "pycore_strhex.h" // _Py_strhex_with_sep()
#include "pycore_long.h" // _PyLong_FromUnsignedChar()
#include "pycore_list.h" // _PyList_GetItemRef
#include "pycore_pyatomic_ft_wrappers.h"
#include "bytesobject.h"

Expand Down
9 changes: 9 additions & 0 deletions Objects/stringlib/join.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,16 @@ STRINGLIB(bytes_join)(PyObject *sep, PyObject *iterable)
*/
for (i = 0, nbufs = 0; i < seqlen; i++) {
Py_ssize_t itemlen;
#ifdef Py_GIL_DISABLED
if (PyList_Check(seq)) {
item = _PyList_GetItemRef((PyListObject *)seq, i);
}
else {
item = PyTuple_GET_ITEM(seq, i);
}
#else
item = PySequence_Fast_GET_ITEM(seq, i);
#endif
if (PyBytes_CheckExact(item)) {
/* Fast path. */
buffers[i].obj = Py_NewRef(item);
Expand Down
Loading