bpo-40170: Use inline _PyType_HasFeature() function (pythonGH-22375)

vstinner · Seth Sims · commit f6cd7a0e50dc · 2020-10-17T21:32:47.000-04:00
Use _PyType_HasFeature() in the _io module and in structseq
implementation. Replace PyType_HasFeature() opaque function call with
_PyType_HasFeature() inlined function.
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
@@ -349,8 +349,9 @@ iobase_dealloc(iobase *self)
     if (_PyIOBase_finalize((PyObject *) self) < 0) {
         /* When called from a heap type's dealloc, the type will be
            decref'ed on return (see e.g. subtype_dealloc in typeobject.c). */
-        if (PyType_HasFeature(Py_TYPE(self), Py_TPFLAGS_HEAPTYPE))
+        if (_PyType_HasFeature(Py_TYPE(self), Py_TPFLAGS_HEAPTYPE)) {
             Py_INCREF(Py_TYPE(self));
+        }
         return;
     }
     _PyObject_GC_UNTRACK(self);
diff --git a/Objects/structseq.c b/Objects/structseq.c
@@ -94,7 +94,7 @@ structseq_dealloc(PyStructSequence *obj)
         Py_XDECREF(obj->ob_item[i]);
     }
     PyObject_GC_Del(obj);
-    if (PyType_GetFlags(tp) & Py_TPFLAGS_HEAPTYPE) {
+    if (_PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE)) {
         Py_DECREF(tp);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ structseq_dealloc(PyStructSequence *obj)`
`94`	`94`	`Py_XDECREF(obj->ob_item[i]);`
`95`	`95`	`}`
`96`	`96`	`PyObject_GC_Del(obj);`
`97`		`- if (PyType_GetFlags(tp) & Py_TPFLAGS_HEAPTYPE) {`
	`97`	`+ if (_PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE)) {`
`98`	`98`	`Py_DECREF(tp);`
`99`	`99`	`}`
`100`	`100`	`}`