summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2024-09-02 12:25:19 (GMT)
committerGitHub <noreply@github.com>2024-09-02 12:25:19 (GMT)
commitf1a0d96f41db9dfa5d7f0b32e72f6f7301a86f91 (patch)
treeab17e40e32127f2657a5a47549a418e063a71ac2 /Objects
parent22fdb8cf899d2dd29f2ac0bf61309af6809719fb (diff)
downloadcpython-f1a0d96f41db9dfa5d7f0b32e72f6f7301a86f91.zip
cpython-f1a0d96f41db9dfa5d7f0b32e72f6f7301a86f91.tar.gz
cpython-f1a0d96f41db9dfa5d7f0b32e72f6f7301a86f91.tar.bz2
gh-123091: Use _Py_IsImmortalLoose() (#123511)
Use _Py_IsImmortalLoose() in bytesobject.c, typeobject.c and ceval.c.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/bytesobject.c6
-rw-r--r--Objects/typeobject.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 4a7c21f..ba66368 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -46,7 +46,7 @@ Py_LOCAL_INLINE(Py_ssize_t) _PyBytesWriter_GetSize(_PyBytesWriter *writer,
static inline PyObject* bytes_get_empty(void)
{
PyObject *empty = &EMPTY->ob_base.ob_base;
- assert(_Py_IsImmortal(empty));
+ assert(_Py_IsImmortalLoose(empty));
return empty;
}
@@ -119,7 +119,7 @@ PyBytes_FromStringAndSize(const char *str, Py_ssize_t size)
}
if (size == 1 && str != NULL) {
op = CHARACTER(*str & 255);
- assert(_Py_IsImmortal(op));
+ assert(_Py_IsImmortalLoose(op));
return (PyObject *)op;
}
if (size == 0) {
@@ -155,7 +155,7 @@ PyBytes_FromString(const char *str)
}
else if (size == 1) {
op = CHARACTER(*str & 255);
- assert(_Py_IsImmortal(op));
+ assert(_Py_IsImmortalLoose(op));
return (PyObject *)op;
}
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index d9c6b99..78f6931 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -485,7 +485,7 @@ set_tp_bases(PyTypeObject *self, PyObject *bases, int initial)
assert(PyTuple_GET_SIZE(bases) == 1);
assert(PyTuple_GET_ITEM(bases, 0) == (PyObject *)self->tp_base);
assert(self->tp_base->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN);
- assert(_Py_IsImmortal(self->tp_base));
+ assert(_Py_IsImmortalLoose(self->tp_base));
}
_Py_SetImmortal(bases);
}
@@ -502,7 +502,7 @@ clear_tp_bases(PyTypeObject *self, int final)
Py_CLEAR(self->tp_bases);
}
else {
- assert(_Py_IsImmortal(self->tp_bases));
+ assert(_Py_IsImmortalLoose(self->tp_bases));
_Py_ClearImmortal(self->tp_bases);
}
}
@@ -567,7 +567,7 @@ clear_tp_mro(PyTypeObject *self, int final)
Py_CLEAR(self->tp_mro);
}
else {
- assert(_Py_IsImmortal(self->tp_mro));
+ assert(_Py_IsImmortalLoose(self->tp_mro));
_Py_ClearImmortal(self->tp_mro);
}
}
@@ -5869,7 +5869,7 @@ fini_static_type(PyInterpreterState *interp, PyTypeObject *type,
int isbuiltin, int final)
{
assert(type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN);
- assert(_Py_IsImmortal((PyObject *)type));
+ assert(_Py_IsImmortalLoose((PyObject *)type));
type_dealloc_common(type);