Tidy up

python · markshannon · Dec 6, 2024 · Nov 9, 2024 · Nov 10, 2024 · Nov 11, 2024
commit 15455081f85f9cf119f439d09fae735636fe011e
diff --git a/Include/internal/pycore_gc.h b/Include/internal/pycore_gc.h
@@ -382,8 +382,6 @@ extern void _PyGC_VisitObjectsWorldStopped(PyInterpreterState *interp,
                                            gcvisitobjects_t callback, void *arg);
 #endif
 
-PyAPI_FUNC(void) _PyGC_MoveUnvisited(PyObject *op, PyGC_Head *to, int visited_space);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/Include/internal/pycore_typeobject.h b/Include/internal/pycore_typeobject.h
@@ -25,14 +25,8 @@ extern "C" {
 #define _Py_TYPE_VERSION_BYTEARRAY 9
 #define _Py_TYPE_VERSION_BYTES 10
 #define _Py_TYPE_VERSION_COMPLEX 11
-#define _Py_TYPE_VERSION_GENERATOR 12
-#define _Py_TYPE_VERSION_COROUTINE 13
-#define _Py_TYPE_VERSION_MODULE 14
-#define _Py_TYPE_VERSION_TYPE 15
-#define _Py_TYPE_VERSION_ASYNC_GENERATOR 16
-#define _Py_TYPE_VERSION_ASYNC_ASEND 17
-
-#define _Py_TYPE_VERSION_NEXT 20
+
+#define _Py_TYPE_VERSION_NEXT 16
 
 
 #define _Py_TYPE_BASE_VERSION_TAG (2<<16)

@@ -883,7 +883,6 @@ PyTypeObject PyGen_Type = {
     gen_memberlist,                             /* tp_members */
     gen_getsetlist,                             /* tp_getset */
     .tp_finalize = _PyGen_Finalize,
-    .tp_version_tag = _Py_TYPE_VERSION_GENERATOR,
 };
 
 static PyObject *
@@ -1226,7 +1225,6 @@ PyTypeObject PyCoro_Type = {
     coro_memberlist,                            /* tp_members */
     coro_getsetlist,                            /* tp_getset */
     .tp_finalize = _PyGen_Finalize,
-    .tp_version_tag = _Py_TYPE_VERSION_COROUTINE,
 };
 
 static void
@@ -1640,7 +1638,6 @@ PyTypeObject PyAsyncGen_Type = {
     async_gen_memberlist,                       /* tp_members */
     async_gen_getsetlist,                       /* tp_getset */
     .tp_finalize = _PyGen_Finalize,
-    .tp_version_tag = _Py_TYPE_VERSION_ASYNC_GENERATOR,
 };
 
 
@@ -1886,7 +1883,6 @@ PyTypeObject _PyAsyncGenASend_Type = {
     async_gen_asend_iternext,                   /* tp_iternext */
     async_gen_asend_methods,                    /* tp_methods */
     .tp_finalize = async_gen_asend_finalize,
-    .tp_version_tag = _Py_TYPE_VERSION_ASYNC_ASEND,
 };
 
 

diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
@@ -1356,5 +1356,4 @@ PyTypeObject PyModule_Type = {
     0,                                          /* tp_alloc */
     new_module,                                 /* tp_new */
     PyObject_GC_Del,                            /* tp_free */
-    .tp_version_tag = _Py_TYPE_VERSION_MODULE,
 };
@@ -6384,7 +6384,6 @@ PyTypeObject PyType_Type = {
     PyObject_GC_Del,                            /* tp_free */
     type_is_gc,                                 /* tp_is_gc */
     .tp_vectorcall = type_vectorcall,
-    .tp_version_tag = _Py_TYPE_VERSION_TYPE,
 };
 
 

diff --git a/Python/gc.c b/Python/gc.c
@@ -1436,9 +1436,11 @@ frame_move_unvisited(_PyInterpreterFrame *frame, WorkStack *stack, int visited_s
     while (sp > locals) {
         sp--;
         _PyStackRef ref = *sp;
-        if (PyStackRef_IsNonNullMortal(ref)) {
+        if (!PyStackRef_IsNull(ref)) {
             PyObject *op = PyStackRef_AsPyObjectBorrow(ref);
-            move_unvisited(op, stack, visited_space);
+            if (!_Py_IsImmortal(op)) {
+                move_unvisited(op, stack, visited_space);
+            }
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                                                gcvisitobjects_t callback, void *arg);
     #endif
-    PyAPI_FUNC(void) _PyGC_MoveUnvisited(PyObject *op, PyGC_Head *to, int visited_space);
     #ifdef __cplusplus
     }
     #endif
@@ Expand Down @@