diff options
| author | Dino Viehland <dinoviehland@meta.com> | 2024-05-02 20:03:05 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-02 20:03:05 (GMT) |
| commit | 1e67b9207c31a92d76bfac09fc706c4dc703669e (patch) | |
| tree | 5f6f4bee04d4168daf715f70ef307518ad956594 /Objects | |
| parent | 8ed546679524140d8282175411fd141fe7df070d (diff) | |
| download | cpython-1e67b9207c31a92d76bfac09fc706c4dc703669e.zip cpython-1e67b9207c31a92d76bfac09fc706c4dc703669e.tar.gz cpython-1e67b9207c31a92d76bfac09fc706c4dc703669e.tar.bz2 | |
gh-117657: Fix TSAN list set failure (#118260)
* Fix TSAN list set failure
* Relaxed atomic is sufficient, add targetted test
* More list
* Remove atomic assign in list
* Fixup white space
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/listobject.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c index 4eaf200..3c4e2d2 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -142,6 +142,9 @@ list_resize(PyListObject *self, Py_ssize_t newsize) } memcpy(array->ob_item, self->ob_item, target_bytes); } + if (new_allocated > (size_t)allocated) { + memset(array->ob_item + allocated, 0, sizeof(PyObject *) * (new_allocated - allocated)); + } _Py_atomic_store_ptr_release(&self->ob_item, &array->ob_item); self->allocated = new_allocated; Py_SET_SIZE(self, newsize); @@ -502,7 +505,7 @@ _PyList_AppendTakeRefListResize(PyListObject *self, PyObject *newitem) Py_DECREF(newitem); return -1; } - PyList_SET_ITEM(self, len, newitem); + FT_ATOMIC_STORE_PTR_RELEASE(self->ob_item[len], newitem); return 0; } @@ -1181,7 +1184,7 @@ list_extend_fast(PyListObject *self, PyObject *iterable) PyObject **dest = self->ob_item + m; for (Py_ssize_t i = 0; i < n; i++) { PyObject *o = src[i]; - dest[i] = Py_NewRef(o); + FT_ATOMIC_STORE_PTR_RELEASE(dest[i], Py_NewRef(o)); } return 0; } @@ -1238,7 +1241,7 @@ list_extend_iter_lock_held(PyListObject *self, PyObject *iterable) if (Py_SIZE(self) < self->allocated) { Py_ssize_t len = Py_SIZE(self); - PyList_SET_ITEM(self, len, item); // steals item ref + FT_ATOMIC_STORE_PTR_RELEASE(self->ob_item[len], item); // steals item ref Py_SET_SIZE(self, len + 1); } else { |