mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-10 10:47:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.13] gh-117657: Make PyType_HasFeature (exported version) atomic (GH-120484) (#120554)

Browse source 
gh-117657: Make PyType_HasFeature (exported version) atomic (GH-120484)

Make PyType_HasFeature (exported version) atomic
(cherry picked from commit 6f63dfff6f)

Co-authored-by: Ken Jin <kenjin@python.org>
This commit is contained in:
Miss Islington (bot) 2024-06-15 17:06:54 +02:00 • committed by GitHub
parent 13a5082afe
commit cbcb5265bf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Include/object.h
View file

@ -1238,7 +1238,11 @@ PyType_HasFeature(PyTypeObject *type, unsigned long feature)
// PyTypeObject is opaque in the limited C API // PyTypeObject is opaque in the limited C API
flags = PyType_GetFlags(type); flags = PyType_GetFlags(type);
#else #else
# ifdef Py_GIL_DISABLED
flags = _Py_atomic_load_ulong_relaxed(&type->tp_flags);
# else
flags = type->tp_flags; flags = type->tp_flags;
# endif
#endif #endif
return ((flags & feature) != 0); return ((flags & feature) != 0);
} }

2
Objects/typeobject.c
View file

@ -3435,7 +3435,7 @@ type_init(PyObject *cls, PyObject *args, PyObject *kwds)
unsigned long unsigned long
PyType_GetFlags(PyTypeObject *type) PyType_GetFlags(PyTypeObject *type)
{ {
return type->tp_flags; return FT_ATOMIC_LOAD_ULONG_RELAXED(type->tp_flags);
} }