Cleanup deallocation of immortal objects

eduardo-elizondo · eduardo-elizondo · commit 59513a7460a6 · 2023-01-16T20:42:36.000-05:00
diff --git a/Objects/boolobject.c b/Objects/boolobject.c
@@ -146,7 +146,7 @@ static void
 bool_dealloc(PyObject *boolean)
 {
     /* This should never get called, but we also don't want to SEGV if
-     * we accidentally decref NotImplemented out of existence. Instead,
+     * we accidentally decref Booleans out of existence. Instead,
      * since Bools are immortal, re-set the reference count.
      */
     _Py_SetImmortal(boolean);
diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -3322,8 +3322,8 @@ static void
 long_dealloc(PyObject *self)
 {
     /* This should never get called, but we also don't want to SEGV if
-     * we accidentally decref NotImplemented out of existence. Instead,
-     * since None is an immortal object, re-set the reference count.
+     * we accidentally decref small Ints out of existence. Instead,
+     * since small Ints are immortal, re-set the reference count.
      */
     PyLongObject *pylong = (PyLongObject*)self;
     if (pylong && IS_MEDIUM_VALUE(pylong)) {
diff --git a/Objects/object.c b/Objects/object.c
@@ -1627,10 +1627,14 @@ none_repr(PyObject *op)
     return PyUnicode_FromString("None");
 }
 
-static void _Py_NO_RETURN
-none_dealloc(PyObject* Py_UNUSED(ignore))
+static void
+none_dealloc(PyObject* none)
 {
-    _Py_FatalRefcountError("deallocating None");
+    /* This should never get called, but we also don't want to SEGV if
+     * we accidentally decref None out of existence. Instead,
+     * since None is an immortal object, re-set the reference count.
+     */
+    _Py_SetImmortal(none);
 }
 
 static PyObject *
@@ -1696,7 +1700,7 @@ PyTypeObject _PyNone_Type = {
     "NoneType",
     0,
     0,
-    none_dealloc,       /*tp_dealloc*/ /*never called*/
+    none_dealloc,       /*tp_dealloc*/
     0,                  /*tp_vectorcall_offset*/
     0,                  /*tp_getattr*/
     0,                  /*tp_setattr*/
@@ -1769,13 +1773,13 @@ notimplemented_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 }
 
 static void
-notimplemented_dealloc(PyObject *none)
+notimplemented_dealloc(PyObject *notimplemented)
 {
     /* This should never get called, but we also don't want to SEGV if
      * we accidentally decref NotImplemented out of existence. Instead,
-     * since None is an immortal object, re-set the reference count.
+     * since Notimplemented is an immortal object, re-set the reference count.
      */
-    _Py_SetImmortal(none);
+    _Py_SetImmortal(notimplemented);
 }
 
 static int
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
@@ -29,6 +29,16 @@ ellipsis_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
     return Py_NewRef(Py_Ellipsis);
 }
 
+static void
+ellipsis_dealloc(PyObject *ellipsis)
+{
+    /* This should never get called, but we also don't want to SEGV if
+     * we accidentally decref Ellipsis out of existence. Instead,
+     * since Ellipsis is an immortal object, re-set the reference count.
+     */
+    _Py_SetImmortal(ellipsis);
+}
+
 static PyObject *
 ellipsis_repr(PyObject *op)
 {
@@ -51,7 +61,7 @@ PyTypeObject PyEllipsis_Type = {
     "ellipsis",                         /* tp_name */
     0,                                  /* tp_basicsize */
     0,                                  /* tp_itemsize */
-    0, /*never called*/                 /* tp_dealloc */
+    ellipsis_dealloc,                   /* tp_dealloc */
     0,                                  /* tp_vectorcall_offset */
     0,                                  /* tp_getattr */
     0,                                  /* tp_setattr */
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -1529,8 +1529,8 @@ unicode_dealloc(PyObject *unicode)
     }
 #endif
     /* This should never get called, but we also don't want to SEGV if
-     * we accidentally decref NotImplemented out of existence. Instead,
-     * since None is an immortal object, re-set the reference count.
+     * we accidentally decref the string out of existence. Instead,
+     * since the string is an immortal object, re-set the reference count.
      */
     if (PyUnicode_CHECK_INTERNED(unicode)) {
         _Py_SetImmortal(unicode);

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ static void`
`146`	`146`	`bool_dealloc(PyObject *boolean)`
`147`	`147`	`{`
`148`	`148`	`/* This should never get called, but we also don't want to SEGV if`
`149`		`- * we accidentally decref NotImplemented out of existence. Instead,`
	`149`	`+ * we accidentally decref Booleans out of existence. Instead,`
`150`	`150`	`* since Bools are immortal, re-set the reference count.`
`151`	`151`	`*/`
`152`	`152`	`_Py_SetImmortal(boolean);`