Move the state/index-related helpers to the top.

python · ericsnowcurrently · Jul 26, 2022 · Jul 8, 2022 · Jul 9, 2022 · Jul 18, 2022
commit 38427a0f4dbfd277bcb8edcb23290ddeb5d1a8d2
@@ -67,6 +67,37 @@ slot_tp_setattro(PyObject *self, PyObject *name, PyObject *value);
 
 static inline PyTypeObject * subclass_from_ref(PyObject *ref);
 
+
+/* helpers for for static builtin types */
+
+static inline size_t
+static_builtin_index_get(PyTypeObject *self)
+{
+    return self->tp_static_builtin_index;
+}
+
+static inline void
+static_builtin_index_set(PyTypeObject *self, size_t index)
+{
+    assert(index < _Py_MAX_STATIC_BUILTIN_TYPES);
+    self->tp_static_builtin_index = index;
+}
+
+static_builtin_type_state *
+_PyStaticType_GetState(PyTypeObject *self)
+{
+    if (static_builtin_index_get(self) == 0) {
+        return NULL;
+    }
+    PyInterpreterState *interp = _PyInterpreterState_GET();
+    return &(interp->types.builtins[static_builtin_index_get(self) - 1]);
+}
+
+// Also see _PyStaticType_InitBuiltin() and _PyStaticType_Dealloc().
+
+/* end static builtin helpers */
+
+
 /*
  * finds the beginning of the docstring's introspection signature.
  * if present, returns a pointer pointing to the first '('.
@@ -4250,8 +4281,6 @@ clear_static_tp_subclasses(PyTypeObject *type)
     Py_CLEAR(type->tp_subclasses);
 }
 
-static inline size_t get_static_builtin_index(PyTypeObject *);
-static inline void set_static_builtin_index(PyTypeObject *, size_t);
 
 void
 _PyStaticType_Dealloc(PyTypeObject *type)
@@ -4276,11 +4305,11 @@ _PyStaticType_Dealloc(PyTypeObject *type)
     if (type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN) {
         /* Reset the type's per-interpreter state.
            This basically undoes what _PyStaticType_InitBuiltin() did. */
-        assert(get_static_builtin_index(type) > 0);
+        assert(static_builtin_index_get(type) > 0);
         static_builtin_type_state *state = _PyStaticType_GetState(type);
         assert(state != NULL);
         state->type = NULL;
-        set_static_builtin_index(type, 0);
+        static_builtin_index_set(type, 0);
 
         PyInterpreterState *interp = _PyInterpreterState_GET();
         assert(interp->types.num_builtins_initialized > 0);
@@ -6702,33 +6731,21 @@ PyType_Ready(PyTypeObject *type)
 }
 
 
-static inline size_t
-get_static_builtin_index(PyTypeObject *self)
-{
-    return self->tp_static_builtin_index;
-}
-
-static inline void
-set_static_builtin_index(PyTypeObject *self, size_t index)
-{
-    self->tp_static_builtin_index = index;
-}
-
 int
 _PyStaticType_InitBuiltin(PyTypeObject *self)
 {
     self->tp_flags = self->tp_flags | _Py_TPFLAGS_STATIC_BUILTIN;
 
     /* It should only be called once for each builtin type. */
-    assert(get_static_builtin_index(self) == 0);
+    assert(static_builtin_index_get(self) == 0);
 
     /* For static types we store some state in an array on each interpreter. */
     PyInterpreterState *interp = _PyInterpreterState_GET();
     interp->types.num_builtins_initialized++;
     assert(interp->types.num_builtins_initialized < _Py_MAX_STATIC_BUILTIN_TYPES);
 
     /* We use 1-based indexing so 0 can mean "not initialized". */
-    set_static_builtin_index(self, interp->types.num_builtins_initialized);
+    static_builtin_index_set(self, interp->types.num_builtins_initialized);
 
     /* Now we initialize the type's per-interpreter state. */
     static_builtin_type_state *state = _PyStaticType_GetState(self);
@@ -6738,16 +6755,6 @@ _PyStaticType_InitBuiltin(PyTypeObject *self)
     return PyType_Ready(self);
 }
 
-static_builtin_type_state *
-_PyStaticType_GetState(PyTypeObject *self)
-{
-    if (get_static_builtin_index(self) == 0) {
-        return NULL;
-    }
-    PyInterpreterState *interp = _PyInterpreterState_GET();
-    return &(interp->types.builtins[get_static_builtin_index(self) - 1]);
-}
-
 
 static int
 add_subclass(PyTypeObject *base, PyTypeObject *type)