Fix the short-circuit in type_ready_set_bases().

python · May 31, 2023 · 86f8ec6 · 86f8ec6
1 parent fe12a90
commit 86f8ec6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -7045,8 +7045,12 @@ type_ready_set_type(PyTypeObject *type)
 static int
 type_ready_set_bases(PyTypeObject *type)
 {
-    if (lookup_tp_bases(type) != NULL) {
-        return 0;
+    if (type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN) {
+        if (!_Py_IsMainInterpreter(_PyInterpreterState_GET())) {
+            assert(lookup_tp_bases(type) != NULL);
+            return 0;
+        }
+        assert(lookup_tp_bases(type) == NULL);
     }
 
     PyObject *bases = lookup_tp_bases(type);