gh-112529: Simplify PyObject_GC_IsTracked and PyObject_GC_IsFinalized (#114732)

colesbury · web-flow · commit df5212df6c6f · 2024-02-28T15:37:59.000-05:00
diff --git a/Modules/clinic/gcmodule.c.h b/Modules/clinic/gcmodule.c.h
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
@@ -383,7 +383,7 @@ gc_get_stats_impl(PyObject *module)
 
 
 /*[clinic input]
-gc.is_tracked
+gc.is_tracked -> bool
 
     obj: object
     /
@@ -393,36 +393,27 @@ Returns true if the object is tracked by the garbage collector.
 Simple atomic objects will return false.
 [clinic start generated code]*/
 
-static PyObject *
-gc_is_tracked(PyObject *module, PyObject *obj)
-/*[clinic end generated code: output=14f0103423b28e31 input=d83057f170ea2723]*/
+static int
+gc_is_tracked_impl(PyObject *module, PyObject *obj)
+/*[clinic end generated code: output=91c8d086b7f47a33 input=423b98ec680c3126]*/
 {
-    PyObject *result;
-
-    if (_PyObject_IS_GC(obj) && _PyObject_GC_IS_TRACKED(obj))
-        result = Py_True;
-    else
-        result = Py_False;
-    return Py_NewRef(result);
+    return PyObject_GC_IsTracked(obj);
 }
 
 /*[clinic input]
-gc.is_finalized
+gc.is_finalized -> bool
 
     obj: object
     /
 
 Returns true if the object has been already finalized by the GC.
 [clinic start generated code]*/
 
-static PyObject *
-gc_is_finalized(PyObject *module, PyObject *obj)
-/*[clinic end generated code: output=e1516ac119a918ed input=201d0c58f69ae390]*/
+static int
+gc_is_finalized_impl(PyObject *module, PyObject *obj)
+/*[clinic end generated code: output=401ff5d6fc660429 input=ca4d111c8f8c4e3a]*/
 {
-    if (_PyObject_IS_GC(obj) && _PyGC_FINALIZED(obj)) {
-         Py_RETURN_TRUE;
-    }
-    Py_RETURN_FALSE;
+    return PyObject_GC_IsFinalized(obj);
 }
 
 /*[clinic input]
diff --git a/Python/gc_free_threading.c b/Python/gc_free_threading.c
@@ -1693,19 +1693,13 @@ PyObject_GC_Del(void *op)
 int
 PyObject_GC_IsTracked(PyObject* obj)
 {
-    if (_PyObject_IS_GC(obj) && _PyObject_GC_IS_TRACKED(obj)) {
-        return 1;
-    }
-    return 0;
+    return _PyObject_GC_IS_TRACKED(obj);
 }
 
 int
 PyObject_GC_IsFinalized(PyObject *obj)
 {
-    if (_PyObject_IS_GC(obj) && _PyGC_FINALIZED(obj)) {
-         return 1;
-    }
-    return 0;
+    return _PyGC_FINALIZED(obj);
 }
 
 struct custom_visitor_args {

Original file line number	Diff line number	Diff line change
`@@ -1693,19 +1693,13 @@ PyObject_GC_Del(void *op)`
`1693`	`1693`	`int`
`1694`	`1694`	`PyObject_GC_IsTracked(PyObject* obj)`
`1695`	`1695`	`{`
`1696`		`- if (_PyObject_IS_GC(obj) && _PyObject_GC_IS_TRACKED(obj)) {`
`1697`		`- return 1;`
`1698`		`- }`
`1699`		`- return 0;`
	`1696`	`+ return _PyObject_GC_IS_TRACKED(obj);`
`1700`	`1697`	`}`
`1701`	`1698`
`1702`	`1699`	`int`
`1703`	`1700`	`PyObject_GC_IsFinalized(PyObject *obj)`
`1704`	`1701`	`{`
`1705`		`- if (_PyObject_IS_GC(obj) && _PyGC_FINALIZED(obj)) {`
`1706`		`- return 1;`
`1707`		`- }`
`1708`		`- return 0;`
	`1702`	`+ return _PyGC_FINALIZED(obj);`
`1709`	`1703`	`}`
`1710`	`1704`
`1711`	`1705`	`struct custom_visitor_args {`