gh-124344: Make _PyObject_IS_GC() use underscored PyType_IS_GC() (#124349)

neonene · web-flow · commit d9d5b3d2ef77 · 2024-09-23T21:14:15.000+02:00
move up _PyType_IS_GC and use it
diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
@@ -732,12 +732,15 @@ _PyObject_GET_WEAKREFS_LISTPTR_FROM_OFFSET(PyObject *op)
     return (PyWeakReference **)((char *)op + offset);
 }
 
+// Fast inlined version of PyType_IS_GC()
+#define _PyType_IS_GC(t) _PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC)
+
 // Fast inlined version of PyObject_IS_GC()
 static inline int
 _PyObject_IS_GC(PyObject *obj)
 {
     PyTypeObject *type = Py_TYPE(obj);
-    return (PyType_IS_GC(type)
+    return (_PyType_IS_GC(type)
             && (type->tp_is_gc == NULL || type->tp_is_gc(obj)));
 }
 
@@ -755,9 +758,6 @@ _PyObject_HashFast(PyObject *op)
     return PyObject_Hash(op);
 }
 
-// Fast inlined version of PyType_IS_GC()
-#define _PyType_IS_GC(t) _PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC)
-
 static inline size_t
 _PyType_PreHeaderSize(PyTypeObject *tp)
 {

Original file line number	Diff line number	Diff line change
`@@ -732,12 +732,15 @@ _PyObject_GET_WEAKREFS_LISTPTR_FROM_OFFSET(PyObject *op)`
`732`	`732`	`return (PyWeakReference *)((char )op + offset);`
`733`	`733`	`}`
`734`	`734`
	`735`	`+// Fast inlined version of PyType_IS_GC()`
	`736`	`+#define _PyType_IS_GC(t) _PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC)`
	`737`	`+`
`735`	`738`	`// Fast inlined version of PyObject_IS_GC()`
`736`	`739`	`static inline int`
`737`	`740`	`_PyObject_IS_GC(PyObject *obj)`
`738`	`741`	`{`
`739`	`742`	`PyTypeObject *type = Py_TYPE(obj);`
`740`		`- return (PyType_IS_GC(type)`
	`743`	`+ return (_PyType_IS_GC(type)`
`741`	`744`	`&& (type->tp_is_gc == NULL \|\| type->tp_is_gc(obj)));`
`742`	`745`	`}`
`743`	`746`
`@@ -755,9 +758,6 @@ _PyObject_HashFast(PyObject *op)`
`755`	`758`	`return PyObject_Hash(op);`
`756`	`759`	`}`
`757`	`760`
`758`		`-// Fast inlined version of PyType_IS_GC()`
`759`		`-#define _PyType_IS_GC(t) _PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC)`
`760`		`-`
`761`	`761`	`static inline size_t`
`762`	`762`	`_PyType_PreHeaderSize(PyTypeObject *tp)`
`763`	`763`	`{`