prevent TYPE_LOCK release during stw

Author: LindaSummer

Objects/typeobject.c

@@ -1920,10 +1920,16 @@ type_set_bases_unlocked(PyTypeObject *type, PyObject *new_bases, PyTypeObject *b
     assert(old_bases != NULL);
     PyTypeObject *old_base = type->tp_base;
 
+#ifdef Py_GIL_DISABLED
+    type_lock_prevent_release();
+#endif
     types_stop_world();
     set_tp_bases(type, Py_NewRef(new_bases), 0);
     type->tp_base = (PyTypeObject *)Py_NewRef(best_base);
     types_start_world();
+#ifdef Py_GIL_DISABLED
+    type_lock_allow_release();
+#endif
 
     PyObject *temp = PyList_New(0);
     if (temp == NULL) {
@@ -1984,10 +1990,16 @@ type_set_bases_unlocked(PyTypeObject *type, PyObject *new_bases, PyTypeObject *b
     if (lookup_tp_bases(type) == new_bases) {
         assert(type->tp_base == best_base);
 
+#ifdef Py_GIL_DISABLED
+        type_lock_prevent_release();
+#endif
         types_stop_world();
         set_tp_bases(type, old_bases, 0);
         type->tp_base = old_base;
         types_start_world();
+#ifdef Py_GIL_DISABLED
+        type_lock_allow_release();
+#endif
 
         Py_DECREF(new_bases);
         Py_DECREF(best_base);

Tools/tsan/suppressions_free_threading.txt

@@ -44,4 +44,3 @@ race:PyObject_Realloc
 
 # gh-133467.  Some of these could be hard to trigger.
 race_top:set_tp_bases
-race_top:type_set_bases_unlocked