gh-103906: Remove immortal refcounting in compile/marshal.c (gh-103922)

corona10 · web-flow · commit 058b96053563 · 2023-06-05T22:38:36.000+09:00
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
@@ -26,7 +26,7 @@ ellipsis_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
         PyErr_SetString(PyExc_TypeError, "EllipsisType takes no arguments");
         return NULL;
     }
-    return Py_NewRef(Py_Ellipsis);
+    return Py_Ellipsis;
 }
 
 static void
diff --git a/Python/compile.c b/Python/compile.c
@@ -900,10 +900,10 @@ static PyObject*
 merge_consts_recursive(PyObject *const_cache, PyObject *o)
 {
     assert(PyDict_CheckExact(const_cache));
-    // None and Ellipsis are singleton, and key is the singleton.
+    // None and Ellipsis are immortal objects, and key is the singleton.
     // No need to merge object and key.
     if (o == Py_None || o == Py_Ellipsis) {
-        return Py_NewRef(o);
+        return o;
     }
 
     PyObject *key = _PyCode_ConstantKey(o);
@@ -6355,7 +6355,7 @@ compiler_error(struct compiler *c, location loc,
     }
     PyObject *loc_obj = PyErr_ProgramTextObject(c->c_filename, loc.lineno);
     if (loc_obj == NULL) {
-        loc_obj = Py_NewRef(Py_None);
+        loc_obj = Py_None;
     }
     PyObject *args = Py_BuildValue("O(OiiOii)", msg, c->c_filename,
                                    loc.lineno, loc.col_offset + 1, loc_obj,
diff --git a/Python/marshal.c b/Python/marshal.c
@@ -1019,23 +1019,23 @@ r_object(RFILE *p)
         break;
 
     case TYPE_NONE:
-        retval = Py_NewRef(Py_None);
+        retval = Py_None;
         break;
 
     case TYPE_STOPITER:
         retval = Py_NewRef(PyExc_StopIteration);
         break;
 
     case TYPE_ELLIPSIS:
-        retval = Py_NewRef(Py_Ellipsis);
+        retval = Py_Ellipsis;
         break;
 
     case TYPE_FALSE:
-        retval = Py_NewRef(Py_False);
+        retval = Py_False;
         break;
 
     case TYPE_TRUE:
-        retval = Py_NewRef(Py_True);
+        retval = Py_True;
         break;
 
     case TYPE_INT:

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ ellipsis_new(PyTypeObject type, PyObject args, PyObject *kwargs)`
`26`	`26`	`PyErr_SetString(PyExc_TypeError, "EllipsisType takes no arguments");`
`27`	`27`	`return NULL;`
`28`	`28`	`}`
`29`		`- return Py_NewRef(Py_Ellipsis);`
	`29`	`+ return Py_Ellipsis;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`static void`
Original file line number	Diff line number	Diff line change
`@@ -900,10 +900,10 @@ static PyObject*`
`900`	`900`	`merge_consts_recursive(PyObject const_cache, PyObject o)`
`901`	`901`	`{`
`902`	`902`	`assert(PyDict_CheckExact(const_cache));`
`903`		`- // None and Ellipsis are singleton, and key is the singleton.`
	`903`	`+ // None and Ellipsis are immortal objects, and key is the singleton.`
`904`	`904`	`// No need to merge object and key.`
`905`	`905`	`if (o == Py_None \|\| o == Py_Ellipsis) {`
`906`		`- return Py_NewRef(o);`
	`906`	`+ return o;`
`907`	`907`	`}`
`908`	`908`
`909`	`909`	`PyObject *key = _PyCode_ConstantKey(o);`
`@@ -6355,7 +6355,7 @@ compiler_error(struct compiler *c, location loc,`
`6355`	`6355`	`}`
`6356`	`6356`	`PyObject *loc_obj = PyErr_ProgramTextObject(c->c_filename, loc.lineno);`
`6357`	`6357`	`if (loc_obj == NULL) {`
`6358`		`- loc_obj = Py_NewRef(Py_None);`
	`6358`	`+ loc_obj = Py_None;`
`6359`	`6359`	`}`
`6360`	`6360`	`PyObject *args = Py_BuildValue("O(OiiOii)", msg, c->c_filename,`
`6361`	`6361`	`loc.lineno, loc.col_offset + 1, loc_obj,`