From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 8 Jul 2020 09:19:38 +0000 (-0700)
Subject: Revert "bpo-40170: PyType_HasFeature() now always calls PyType_GetFlags() (GH-19378... 
X-Git-Tag: v3.9.0b5~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0a6f1167834c87f12e2eca11dd77143103e7691;p=thirdparty%2FPython%2Fcpython.git

Revert "bpo-40170: PyType_HasFeature() now always calls PyType_GetFlags() (GH-19378)" (GH-21390)


This partially reverts commit 45ec5b99aefa54552947049086e87ec01bc2fc9a.
(cherry picked from commit b26a0db8ea2de3a8a8e4b40e69fc8642c7d7cb68)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Include/object.h b/Include/object.h
index 514d934196f5..9c1a7f479e44 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -618,8 +618,16 @@ times.
 
 
 static inline int
-PyType_HasFeature(PyTypeObject *type, unsigned long feature) {
-    return ((PyType_GetFlags(type) & feature) != 0);
+PyType_HasFeature(PyTypeObject *type, unsigned long feature)
+{
+    unsigned long flags;
+#ifdef Py_LIMITED_API
+    // PyTypeObject is opaque in the limited C API
+    flags = PyType_GetFlags(type);
+#else
+    flags = type->tp_flags;
+#endif
+    return ((flags & feature) != 0);
 }
 
 #define PyType_FastSubclass(type, flag) PyType_HasFeature(type, flag)
diff --git a/Misc/NEWS.d/next/C API/2020-07-08-10-14-52.bpo-40170.N6Qx1i.rst b/Misc/NEWS.d/next/C API/2020-07-08-10-14-52.bpo-40170.N6Qx1i.rst
new file mode 100644
index 000000000000..760a3ff4d17b
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2020-07-08-10-14-52.bpo-40170.N6Qx1i.rst	
@@ -0,0 +1,4 @@
+Revert :c:func:`PyType_HasFeature` change: it reads again directly the
+:c:member:`PyTypeObject.tp_flags` member when the limited C API is not used,
+rather than always calling :c:func:`PyType_GetFlags` which hides implementation
+details.