A bit more tidying up

markshannon · markshannon · commit a1a38c8da1e3 · 2024-12-03T12:43:15.000Z
diff --git a/Include/internal/pycore_stackref.h b/Include/internal/pycore_stackref.h
@@ -189,8 +189,6 @@ static const _PyStackRef PyStackRef_NULL = { .bits = 0 };
 
 #endif // Py_GIL_DISABLED
 
-#define PyStackRef_IsNonNullMortal(stackref) (!PyStackRef_IsNull(stackref) && !_Py_IsImmortal(PyStackRef_AsPyObjectBorrow(stackref)))
-
 // Check if a stackref is exactly the same as another stackref, including the
 // the deferred bit. This can only be used safely if you know that the deferred
 // bits of `a` and `b` match.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -4156,7 +4156,6 @@ type_new_descriptors(const type_new_ctx *ctx, PyTypeObject *type)
         assert((type->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0);
         type->tp_flags |= Py_TPFLAGS_MANAGED_DICT;
         type->tp_dictoffset = -1;
-
         if (type->tp_basicsize == sizeof(PyObject *)) {
             type->tp_traverse = plain_object_traverse;
         }
@@ -6246,7 +6245,6 @@ PyDoc_STRVAR(type_doc,
 "type(object) -> the object's type\n"
 "type(name, bases, dict, **kwds) -> a new type");
 
-
 static int
 type_traverse(PyObject *self, visitproc visit, void *arg)
 {
diff --git a/Python/gc.c b/Python/gc.c
@@ -1340,7 +1340,6 @@ push_to_stack(PyGC_Head *gc, WorkStack *stack)
 {
     PyGC_Head *prev = GC_PREV(gc);
     PyGC_Head *next = GC_NEXT(gc);
-
     _PyGCHead_SET_NEXT(prev, next);
     _PyGCHead_SET_PREV(next, prev);
     _PyGCHead_SET_PREV(gc, stack->top);

Original file line number	Diff line number	Diff line change
`@@ -4156,7 +4156,6 @@ type_new_descriptors(const type_new_ctx ctx, PyTypeObject type)`
`4156`	`4156`	`assert((type->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0);`
`4157`	`4157`	`type->tp_flags \|= Py_TPFLAGS_MANAGED_DICT;`
`4158`	`4158`	`type->tp_dictoffset = -1;`
`4159`		`-`
`4160`	`4159`	`if (type->tp_basicsize == sizeof(PyObject *)) {`
`4161`	`4160`	`type->tp_traverse = plain_object_traverse;`
`4162`	`4161`	`}`
`@@ -6246,7 +6245,6 @@ PyDoc_STRVAR(type_doc,`
`6246`	`6245`	`"type(object) -> the object's type\n"`
`6247`	`6246`	`"type(name, bases, dict, **kwds) -> a new type");`
`6248`	`6247`
`6249`		`-`
`6250`	`6248`	`static int`
`6251`	`6249`	`type_traverse(PyObject self, visitproc visit, void arg)`
`6252`	`6250`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1340,7 +1340,6 @@ push_to_stack(PyGC_Head gc, WorkStack stack)`
`1340`	`1340`	`{`
`1341`	`1341`	`PyGC_Head *prev = GC_PREV(gc);`
`1342`	`1342`	`PyGC_Head *next = GC_NEXT(gc);`
`1343`		`-`
`1344`	`1343`	`_PyGCHead_SET_NEXT(prev, next);`
`1345`	`1344`	`_PyGCHead_SET_PREV(next, prev);`
`1346`	`1345`	`_PyGCHead_SET_PREV(gc, stack->top);`