Experiment: Make all decrefs calls

Author: markshannon

Include/internal/pycore_object.h

@@ -306,6 +306,8 @@ Py_ssize_t _Py_ExplicitMergeRefcount(PyObject *op, Py_ssize_t extra);
 #  undef _Py_DEC_REFTOTAL
 #endif
 
+PyAPI_FUNC(void) _Py_DecRefMortal(PyObject *op);
+PyAPI_FUNC(void) _Py_DecRefMortal_Debug(const char *filename, int lineno, PyObject *op);
 
 extern int _PyType_CheckConsistency(PyTypeObject *type);
 extern int _PyDict_CheckConsistency(PyObject *mp, int check_content);
@@ -436,21 +438,8 @@ _Py_DECREF_CODE(PyCodeObject *co)
 #ifndef Py_GIL_DISABLED
 #ifdef Py_REF_DEBUG
 
-static inline void Py_DECREF_MORTAL(const char *filename, int lineno, PyObject *op)
-{
-    if (op->ob_refcnt <= 0) {
-        _Py_NegativeRefcount(filename, lineno, op);
-    }
-    _Py_DECREF_STAT_INC();
-    assert(!_Py_IsStaticImmortal(op));
-    if (!_Py_IsImmortal(op)) {
-        _Py_DECREF_DecRefTotal();
-    }
-    if (--op->ob_refcnt == 0) {
-        _Py_Dealloc(op);
-    }
-}
-#define Py_DECREF_MORTAL(op) Py_DECREF_MORTAL(__FILE__, __LINE__, _PyObject_CAST(op))
+
+#define Py_DECREF_MORTAL(op) _Py_DecRefMortal_Debug(__FILE__, __LINE__, _PyObject_CAST(op))
 
 static inline void _Py_DECREF_MORTAL_SPECIALIZED(const char *filename, int lineno, PyObject *op, destructor destruct)
 {

Include/refcount.h

@@ -392,45 +392,14 @@ static inline void Py_DECREF(PyObject *op)
 
 #elif defined(Py_REF_DEBUG)
 
-static inline void Py_DECREF(const char *filename, int lineno, PyObject *op)
-{
-#if SIZEOF_VOID_P > 4
-    /* If an object has been freed, it will have a negative full refcnt
-     * If it has not it been freed, will have a very large refcnt */
-    if (op->ob_refcnt_full <= 0 || op->ob_refcnt > (((PY_UINT32_T)-1) - (1<<20))) {
-#else
-    if (op->ob_refcnt <= 0) {
-#endif
-        _Py_NegativeRefcount(filename, lineno, op);
-    }
-    if (_Py_IsImmortal(op)) {
-        _Py_DECREF_IMMORTAL_STAT_INC();
-        return;
-    }
-    _Py_DECREF_STAT_INC();
-    _Py_DECREF_DecRefTotal();
-    if (--op->ob_refcnt == 0) {
-        _Py_Dealloc(op);
-    }
-}
-#define Py_DECREF(op) Py_DECREF(__FILE__, __LINE__, _PyObject_CAST(op))
+
+PyAPI_FUNC(void) _Py_DecRef_Debug(const char *filename, int lineno, PyObject *op);
+
+#define Py_DECREF(op) _Py_DecRef_Debug(__FILE__, __LINE__, _PyObject_CAST(op))
 
 #else
 
-static inline Py_ALWAYS_INLINE void Py_DECREF(PyObject *op)
-{
-    // Non-limited C API and limited C API for Python 3.9 and older access
-    // directly PyObject.ob_refcnt.
-    if (_Py_IsImmortal(op)) {
-        _Py_DECREF_IMMORTAL_STAT_INC();
-        return;
-    }
-    _Py_DECREF_STAT_INC();
-    if (--op->ob_refcnt == 0) {
-        _Py_Dealloc(op);
-    }
-}
-#define Py_DECREF(op) Py_DECREF(_PyObject_CAST(op))
+#define Py_DECREF(op) _Py_DecRef(_PyObject_CAST(op))
 #endif
 
 

Objects/object.c

@@ -349,9 +349,65 @@ _Py_IncRef(PyObject *o)
 }
 
 void
-_Py_DecRef(PyObject *o)
+_Py_DecRef(PyObject *op)
 {
-    Py_DECREF(o);
+    if (_Py_IsImmortal(op)) {
+        _Py_DECREF_IMMORTAL_STAT_INC();
+        return;
+    }
+    _Py_DECREF_STAT_INC();
+    if (--op->ob_refcnt == 0) {
+        _Py_Dealloc(op);
+    }
+}
+
+void
+_Py_DecRefMortal(PyObject *op)
+{
+    _Py_DECREF_STAT_INC();
+    if (--op->ob_refcnt == 0) {
+        _Py_Dealloc(op);
+    }
+}
+
+
+void
+_Py_DecRefMortal_Debug(const char *filename, int lineno, PyObject *op)
+{
+    if (op->ob_refcnt <= 0) {
+        _Py_NegativeRefcount(filename, lineno, op);
+    }
+    _Py_DECREF_STAT_INC();
+    assert(!_Py_IsStaticImmortal(op));
+    if (!_Py_IsImmortal(op)) {
+        _Py_DECREF_DecRefTotal();
+    }
+    if (--op->ob_refcnt == 0) {
+        _Py_Dealloc(op);
+    }
+}
+
+void
+_Py_DecRef_Debug(const char *filename, int lineno, PyObject *op)
+{
+#if SIZEOF_VOID_P > 4
+    /* If an object has been freed, it will have a negative full refcnt
+     * If it has not it been freed, will have a very large refcnt */
+    if (op->ob_refcnt_full <= 0 || op->ob_refcnt > (((PY_UINT32_T)-1) - (1<<20))) {
+#else
+    if (op->ob_refcnt <= 0) {
+#endif
+        _Py_NegativeRefcount(filename, lineno, op);
+    }
+    if (_Py_IsImmortal(op)) {
+        _Py_DECREF_IMMORTAL_STAT_INC();
+        return;
+    }
+    _Py_DECREF_STAT_INC();
+    _Py_DECREF_DecRefTotal();
+    if (--op->ob_refcnt == 0) {
+        _Py_Dealloc(op);
+    }
 }
 
 #ifdef Py_GIL_DISABLED