[3.13] pythongh-117657: Make PyType_HasFeature (exported version) ato…

…mic (pythonGH-120484) (python#120554) pythongh-117657: Make PyType_HasFeature (exported version) atomic (pythonGH-120484) Make PyType_HasFeature (exported version) atomic (cherry picked from commit 6f63dff) Co-authored-by: Ken Jin <[email protected]>
miss-islington · Jun 15, 2024 · cbcb526 · cbcb526
1 parent 13a5082
commit cbcb526
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Include/object.h b/Include/object.h
@@ -1238,7 +1238,11 @@ PyType_HasFeature(PyTypeObject *type, unsigned long feature)
     // PyTypeObject is opaque in the limited C API
     flags = PyType_GetFlags(type);
 #else
-    flags = type->tp_flags;
+#   ifdef Py_GIL_DISABLED
+        flags = _Py_atomic_load_ulong_relaxed(&type->tp_flags);
+#   else
+        flags = type->tp_flags;
+#   endif
 #endif
     return ((flags & feature) != 0);
 }

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -3435,7 +3435,7 @@ type_init(PyObject *cls, PyObject *args, PyObject *kwds)
 unsigned long
 PyType_GetFlags(PyTypeObject *type)
 {
-    return type->tp_flags;
+    return FT_ATOMIC_LOAD_ULONG_RELAXED(type->tp_flags);
 }