Update

corona10 · corona10 · commit 8f187ff7f21c · 2024-05-17T01:48:23.000-04:00
diff --git a/Objects/listobject.c b/Objects/listobject.c
@@ -650,8 +650,8 @@ list_contains(PyObject *aa, PyObject *el)
 static inline PyObject *
 list_item_try_lock_free(PyListObject *a, Py_ssize_t i)
 {
-    PyObject **ob_item = FT_ATOMIC_LOAD_PTR(a->ob_item);
-    PyObject *item = FT_ATOMIC_LOAD_PTR(ob_item[i]);
+    PyObject **ob_item = _Py_atomic_load_ptr(&a->ob_item);
+    PyObject *item = _Py_atomic_load_ptr(&ob_item[i]);
     if (!item || !_Py_TryIncrefCompare(&ob_item[i], item)) {
         return NULL;
     }
@@ -662,13 +662,15 @@ static PyObject *
 list_item(PyObject *aa, Py_ssize_t i)
 {
     PyListObject *a = (PyListObject *)aa;
+    PyObject *item;
     if (!valid_index(i, PyList_GET_SIZE(a))) {
         PyErr_SetObject(PyExc_IndexError, &_Py_STR(list_err));
         return NULL;
     }
 #ifdef Py_GIL_DISABLED
-    PyObject *item = list_item_try_lock_free(a, i);
-    if (item != NULL) {
+    PyObject **ob_item = _Py_atomic_load_ptr(&a->ob_item);
+    item = _Py_atomic_load_ptr(&ob_item[i]);
+    if (item && _Py_TryIncrefCompare(&ob_item[i], item)) {
         goto end;
     }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -650,8 +650,8 @@ list_contains(PyObject aa, PyObject el)`
`650`	`650`	`static inline PyObject *`
`651`	`651`	`list_item_try_lock_free(PyListObject *a, Py_ssize_t i)`
`652`	`652`	`{`
`653`		`- PyObject **ob_item = FT_ATOMIC_LOAD_PTR(a->ob_item);`
`654`		`- PyObject *item = FT_ATOMIC_LOAD_PTR(ob_item[i]);`
	`653`	`+ PyObject **ob_item = _Py_atomic_load_ptr(&a->ob_item);`
	`654`	`+ PyObject *item = _Py_atomic_load_ptr(&ob_item[i]);`
`655`	`655`	`if (!item \|\| !_Py_TryIncrefCompare(&ob_item[i], item)) {`
`656`	`656`	`return NULL;`
`657`	`657`	`}`
`@@ -662,13 +662,15 @@ static PyObject *`
`662`	`662`	`list_item(PyObject *aa, Py_ssize_t i)`
`663`	`663`	`{`
`664`	`664`	`PyListObject a = (PyListObject )aa;`
	`665`	`+ PyObject *item;`
`665`	`666`	`if (!valid_index(i, PyList_GET_SIZE(a))) {`
`666`	`667`	`PyErr_SetObject(PyExc_IndexError, &_Py_STR(list_err));`
`667`	`668`	`return NULL;`
`668`	`669`	`}`
`669`	`670`	`#ifdef Py_GIL_DISABLED`
`670`		`- PyObject *item = list_item_try_lock_free(a, i);`
`671`		`- if (item != NULL) {`
	`671`	`+ PyObject **ob_item = _Py_atomic_load_ptr(&a->ob_item);`
	`672`	`+ item = _Py_atomic_load_ptr(&ob_item[i]);`
	`673`	`+ if (item && _Py_TryIncrefCompare(&ob_item[i], item)) {`
`672`	`674`	`goto end;`
`673`	`675`	`}`
`674`	`676`	`#endif`