naming: IMMORTAL --> NO_DEALLOC

sweeneyde · sweeneyde · commit ad146ef86e5c · 2022-04-12T01:13:23.000-04:00
diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
@@ -49,15 +49,15 @@ _Py_DECREF_SPECIALIZED(PyObject *op, const destructor destruct)
 }
 
 static inline void
-_Py_DECREF_IMMORTAL(PyObject *op)
+_Py_DECREF_NO_DEALLOC(PyObject *op)
 {
 #ifdef Py_REF_DEBUG
     _Py_RefTotal--;
 #endif
     op->ob_refcnt--;
 #ifdef Py_DEBUG
     if (op->ob_refcnt <= 0) {
-        _Py_FatalRefcountError("deallocating a singleton");
+        _Py_FatalRefcountError("Expected a positive remaining refcount");
     }
 #endif
 }
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -2018,7 +2018,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
              * that the string is safe to mutate.
              */
             assert(Py_REFCNT(left) >= 2);
-            Py_DECREF(left); // XXX never need to dealloc
+            _Py_DECREF_NO_DEALLOC(left);
             STACK_SHRINK(2);
             PyUnicode_Append(target_local, right);
             _Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
@@ -3940,11 +3940,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             PREDICTED(POP_JUMP_BACKWARD_IF_FALSE);
             PyObject *cond = POP();
             if (Py_IsTrue(cond)) {
-                _Py_DECREF_IMMORTAL(cond);
+                _Py_DECREF_NO_DEALLOC(cond);
                 DISPATCH();
             }
             if (Py_IsFalse(cond)) {
-                _Py_DECREF_IMMORTAL(cond);
+                _Py_DECREF_NO_DEALLOC(cond);
                 JUMPBY(-oparg);
                 CHECK_EVAL_BREAKER();
                 DISPATCH();
@@ -3966,10 +3966,10 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             PREDICTED(POP_JUMP_FORWARD_IF_FALSE);
             PyObject *cond = POP();
             if (Py_IsTrue(cond)) {
-                _Py_DECREF_IMMORTAL(cond);
+                _Py_DECREF_NO_DEALLOC(cond);
             }
             else if (Py_IsFalse(cond)) {
-                _Py_DECREF_IMMORTAL(cond);
+                _Py_DECREF_NO_DEALLOC(cond);
                 JUMPBY(oparg);
             }
             else {
@@ -3989,11 +3989,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
         TARGET(POP_JUMP_BACKWARD_IF_TRUE) {
             PyObject *cond = POP();
             if (Py_IsFalse(cond)) {
-                _Py_DECREF_IMMORTAL(cond);
+                _Py_DECREF_NO_DEALLOC(cond);
                 DISPATCH();
             }
             if (Py_IsTrue(cond)) {
-                _Py_DECREF_IMMORTAL(cond);
+                _Py_DECREF_NO_DEALLOC(cond);
                 JUMPBY(-oparg);
                 CHECK_EVAL_BREAKER();
                 DISPATCH();
@@ -4014,10 +4014,10 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
         TARGET(POP_JUMP_FORWARD_IF_TRUE) {
             PyObject *cond = POP();
             if (Py_IsFalse(cond)) {
-                _Py_DECREF_IMMORTAL(cond);
+                _Py_DECREF_NO_DEALLOC(cond);
             }
             else if (Py_IsTrue(cond)) {
-                _Py_DECREF_IMMORTAL(cond);
+                _Py_DECREF_NO_DEALLOC(cond);
                 JUMPBY(oparg);
             }
             else {
@@ -4042,7 +4042,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
                 CHECK_EVAL_BREAKER();
                 DISPATCH();
             }
-            _Py_DECREF_IMMORTAL(value);
+            _Py_DECREF_NO_DEALLOC(value);
             DISPATCH();
         }
 
@@ -4058,7 +4058,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
         TARGET(POP_JUMP_BACKWARD_IF_NONE) {
             PyObject *value = POP();
             if (Py_IsNone(value)) {
-                _Py_DECREF_IMMORTAL(value);
+                _Py_DECREF_NO_DEALLOC(value);
                 JUMPBY(-oparg);
                 CHECK_EVAL_BREAKER();
             }
@@ -4071,7 +4071,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
         TARGET(POP_JUMP_FORWARD_IF_NONE) {
             PyObject *value = POP();
             if (Py_IsNone(value)) {
-                _Py_DECREF_IMMORTAL(value);
+                _Py_DECREF_NO_DEALLOC(value);
                 JUMPBY(oparg);
             }
             else {
@@ -4085,7 +4085,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             int err;
             if (Py_IsTrue(cond)) {
                 STACK_SHRINK(1);
-                _Py_DECREF_IMMORTAL(cond);
+                _Py_DECREF_NO_DEALLOC(cond);
                 DISPATCH();
             }
             if (Py_IsFalse(cond)) {
@@ -4109,7 +4109,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             int err;
             if (Py_IsFalse(cond)) {
                 STACK_SHRINK(1);
-                _Py_DECREF_IMMORTAL(cond);
+                _Py_DECREF_NO_DEALLOC(cond);
                 DISPATCH();
             }
             if (Py_IsTrue(cond)) {
