From 9ad94d3d1e78f9af576bde68b758a1f1c082f49c Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Wed, 17 Apr 2024 12:44:26 +0200 Subject: [PATCH] gh-94673: Fix compiler warning in typeobject.c static_builtin_index_is_set() is only used in asserts; inline it to avoid compiler warnings. --- Objects/typeobject.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 1cb53516a9ae76..18f3867f07d81e 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -116,16 +116,10 @@ type_from_ref(PyObject *ref) /* helpers for for static builtin types */ -static inline int -static_builtin_index_is_set(PyTypeObject *self) -{ - return self->tp_subclasses != NULL; -} - static inline size_t static_builtin_index_get(PyTypeObject *self) { - assert(static_builtin_index_is_set(self)); + assert(self->tp_subclasses != NULL); /* We store a 1-based index so 0 can mean "not initialized". */ return (size_t)self->tp_subclasses - 1; } @@ -163,7 +157,7 @@ static void static_builtin_state_init(PyInterpreterState *interp, PyTypeObject *self) { if (_Py_IsMainInterpreter(interp)) { - assert(!static_builtin_index_is_set(self)); + assert(self->tp_subclasses == NULL); static_builtin_index_set(self, interp->types.num_builtins_initialized); } else {