diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2024-06-15 15:06:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-15 15:06:54 (GMT) |
| commit | cbcb5265bfaf80af386faa8858359bb6f15cb77d (patch) | |
| tree | b9356895861acde009e241f7753ff4eaff74858b | |
| parent | 13a5082afea155b8558c700156e3832548d78b3a (diff) | |
| download | cpython-cbcb5265bfaf80af386faa8858359bb6f15cb77d.zip cpython-cbcb5265bfaf80af386faa8858359bb6f15cb77d.tar.gz cpython-cbcb5265bfaf80af386faa8858359bb6f15cb77d.tar.bz2 | |
[3.13] gh-117657: Make PyType_HasFeature (exported version) atomic (GH-120484) (#120554)
gh-117657: Make PyType_HasFeature (exported version) atomic (GH-120484)
Make PyType_HasFeature (exported version) atomic
(cherry picked from commit 6f63dfff6f493b405f3422210a168369e1e7a35d)
Co-authored-by: Ken Jin <kenjin@python.org>
| -rw-r--r-- | Include/object.h | 6 | ||||
| -rw-r--r-- | Objects/typeobject.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Include/object.h b/Include/object.h index a687bf2..7aaa8da 100644 --- 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 index 1f6c282..1123ef6 100644 --- 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); } |