[3.12] pythongh-123091: Use more _Py_IsImmortalLoose() (pythonGH-123602)

encukou · encukou · commit c92532609daa · 2024-10-03T13:24:56.000+02:00
Switch more _Py_IsImmortal(...) assertions to _Py_IsImmortalLoose(...)

The remaining calls to _Py_IsImmortal are in free-threaded-only code,
initialization of core objects, tests, and guards that fall back to
code that works with mortal objects.

(For this 3.12 backport commit, I re-checked all calls to _Py_IsImmortal;
the changed calls are different from the commits to 3.13 &amp; 3.14.)
diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
@@ -109,7 +109,7 @@ static inline void _Py_SetImmortal(PyObject *op)
 static inline void _Py_ClearImmortal(PyObject *op)
 {
     if (op) {
-        assert(_Py_IsImmortal(op));
+        assert(_Py_IsImmortalLoose(op));
         op->ob_refcnt = 1;
         Py_DECREF(op);
     }
diff --git a/Objects/structseq.c b/Objects/structseq.c
@@ -623,7 +623,7 @@ _PyStructSequence_FiniBuiltin(PyInterpreterState *interp, PyTypeObject *type)
     assert(type->tp_name != NULL);
     assert(type->tp_base == &PyTuple_Type);
     assert((type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN));
-    assert(_Py_IsImmortal(type));
+    assert(_Py_IsImmortalLoose(type));
 
     // Cannot delete a type if it still has subclasses
     if (_PyType_HasSubclasses(type)) {
diff --git a/Python/import.c b/Python/import.c
@@ -1080,7 +1080,7 @@ _extensions_cache_delete(PyObject *filename, PyObject *name)
        However, this decref would be problematic if the module def were
        dynamically allocated, it were the last ref, and this function
        were called with an interpreter other than the def's owner. */
-    assert(_Py_IsImmortal(entry->value));
+    assert(_Py_IsImmortalLoose(entry->value));
     entry->value = NULL;
 
 finally:

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ static inline void _Py_SetImmortal(PyObject *op)`
`109`	`109`	`static inline void _Py_ClearImmortal(PyObject *op)`
`110`	`110`	`{`
`111`	`111`	`if (op) {`
`112`		`- assert(_Py_IsImmortal(op));`
	`112`	`+ assert(_Py_IsImmortalLoose(op));`
`113`	`113`	`op->ob_refcnt = 1;`
`114`	`114`	`Py_DECREF(op);`
`115`	`115`	`}`