From 6f63dfff6f493b405f3422210a168369e1e7a35d Mon Sep 17 00:00:00 2001
From: Ken Jin <kenjin@python.org>
Date: Sat, 15 Jun 2024 22:39:22 +0800
Subject: [PATCH] gh-117657: Make PyType_HasFeature (exported version) atomic
 (#120484)

Make PyType_HasFeature (exported version) atomic
---
 Include/object.h     | 6 +++++-
 Objects/typeobject.c | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Include/object.h b/Include/object.h
index 4a39ada8c7d..f71aaee7efe 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -756,7 +756,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
index 98e00bd25c3..eb296414bb7 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3599,7 +3599,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);
 }