gh-112069: Make PySet_GET_SIZE to be atomic safe. (gh-118053)

corona10 · web-flow · commit 710c01be94ca · 2024-04-19T06:40:28.000+09:00
gh-112069: Make PySet_GET_SIZE to be atomic operation
diff --git a/Include/cpython/setobject.h b/Include/cpython/setobject.h
@@ -62,6 +62,10 @@ typedef struct {
     (assert(PyAnySet_Check(so)), _Py_CAST(PySetObject*, so))
 
 static inline Py_ssize_t PySet_GET_SIZE(PyObject *so) {
+#ifdef Py_GIL_DISABLED
+    return _Py_atomic_load_ssize_relaxed(&(_PySet_CAST(so)->used));
+#else
     return _PySet_CAST(so)->used;
+#endif
 }
 #define PySet_GET_SIZE(so) PySet_GET_SIZE(_PyObject_CAST(so))
diff --git a/Objects/setobject.c b/Objects/setobject.c
@@ -2080,7 +2080,6 @@ set_issuperset_impl(PySetObject *so, PyObject *other)
     Py_RETURN_TRUE;
 }
 
-// TODO: Make thread-safe in free-threaded builds
 static PyObject *
 set_richcompare(PySetObject *v, PyObject *w, int op)
 {

Original file line number	Diff line number	Diff line change
`@@ -2080,7 +2080,6 @@ set_issuperset_impl(PySetObject so, PyObject other)`
`2080`	`2080`	`Py_RETURN_TRUE;`
`2081`	`2081`	`}`
`2082`	`2082`
`2083`		`-// TODO: Make thread-safe in free-threaded builds`
`2084`	`2083`	`static PyObject *`
`2085`	`2084`	`set_richcompare(PySetObject v, PyObject w, int op)`
`2086`	`2085`	`{`