Fix the short-circuit in type_ready_set_bases().

ericsnowcurrently · ericsnowcurrently · commit 86f8ec6496b3 · 2023-05-30T18:17:22.000-06:00
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);

Original file line number	Diff line number	Diff line change
`@@ -7045,8 +7045,12 @@ type_ready_set_type(PyTypeObject *type)`
`7045`	`7045`	`static int`
`7046`	`7046`	`type_ready_set_bases(PyTypeObject *type)`
`7047`	`7047`	`{`
`7048`		`- if (lookup_tp_bases(type) != NULL) {`
`7049`		`- return 0;`
	`7048`	`+ if (type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN) {`
	`7049`	`+ if (!_Py_IsMainInterpreter(_PyInterpreterState_GET())) {`
	`7050`	`+ assert(lookup_tp_bases(type) != NULL);`
	`7051`	`+ return 0;`
	`7052`	`+ }`
	`7053`	`+ assert(lookup_tp_bases(type) == NULL);`
`7050`	`7054`	`}`
`7051`	`7055`
`7052`	`7056`	`PyObject *bases = lookup_tp_bases(type);`