From: Mark Shannon <mark@hotpy.org>
Date: Tue, 11 Mar 2025 11:53:07 +0000 (+0000)
Subject: GH-127705: Check for immortality in refcount accounting (#131072)
X-Git-Tag: v3.14.0a6~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e5b9f3d00658ce07909d78d1a796e95ad5dba1a;p=thirdparty%2FPython%2Fcpython.git

GH-127705: Check for immortality in refcount accounting (#131072)

Check for immortality in refcount accounting
---

diff --git a/Include/refcount.h b/Include/refcount.h
index 88918409d934..e66e4aaace31 100644
--- a/Include/refcount.h
+++ b/Include/refcount.h
@@ -249,7 +249,9 @@ static inline Py_ALWAYS_INLINE void Py_INCREF_MORTAL(PyObject *op)
     op->ob_refcnt++;
     _Py_INCREF_STAT_INC();
 #if defined(Py_REF_DEBUG) && !defined(Py_LIMITED_API)
-    _Py_INCREF_IncRefTotal();
+    if (!_Py_IsImmortal(op)) {
+        _Py_INCREF_IncRefTotal();
+    }
 #endif
 }
 #endif
@@ -391,7 +393,9 @@ static inline void Py_DECREF_MORTAL(const char *filename, int lineno, PyObject *
     }
     _Py_DECREF_STAT_INC();
     assert(!_Py_IsStaticImmortal(op));
-    _Py_DECREF_DecRefTotal();
+    if (!_Py_IsImmortal(op)) {
+        _Py_DECREF_DecRefTotal();
+    }
     if (--op->ob_refcnt == 0) {
         _Py_Dealloc(op);
     }
@@ -407,7 +411,9 @@ static inline void _Py_DECREF_MORTAL_SPECIALIZED(const char *filename, int linen
     }
     _Py_DECREF_STAT_INC();
     assert(!_Py_IsStaticImmortal(op));
-    _Py_DECREF_DecRefTotal();
+    if (!_Py_IsImmortal(op)) {
+        _Py_DECREF_DecRefTotal();
+    }
     if (--op->ob_refcnt == 0) {
         destruct(op);
     }