Address reviews

Author: Fidget-Spinner

Lib/test/test_free_threading/test_type.py

@@ -106,7 +106,7 @@ class Bar:
         thing = Foo()
         def work():
             foo = thing
-            for _ in range(10000):
+            for _ in range(5000):
                 foo.__class__ = Bar
                 type(foo)
                 foo.__class__ = Foo

Objects/typeobject.c

@@ -6607,7 +6607,7 @@ compatible_for_assignment(PyTypeObject* oldto, PyTypeObject* newto, const char*
 
 
 static int
-object_set_class_world_stopped(PyObject *self, PyTypeObject *newto, PyTypeObject **oldto_p)
+object_set_class_world_stopped(PyObject *self, PyTypeObject *newto)
 {
     PyTypeObject *oldto = Py_TYPE(self);
 
@@ -6682,13 +6682,7 @@ object_set_class_world_stopped(PyObject *self, PyTypeObject *newto, PyTypeObject
                 }
             }
 
-            // If we raced after materialization and replaced the dict
-            // then the materialized dict should no longer have the
-            // inline values in which case detach is a nop.
-            // Note: we don't need to lock here because the world should be stopped.
-
-            assert(_PyObject_GetManagedDict(self) == dict ||
-                   dict->ma_values != _PyObject_InlineValues(self));
+            assert(_PyObject_GetManagedDict(self) == dict);
 
             if (_PyDict_DetachFromObject(dict, self) < 0) {
                 return -1;
@@ -6701,8 +6695,6 @@ object_set_class_world_stopped(PyObject *self, PyTypeObject *newto, PyTypeObject
 
         Py_SET_TYPE(self, newto);
 
-        *oldto_p = oldto;
-
         return 0;
     }
     else {
@@ -6734,12 +6726,10 @@ object_set_class(PyObject *self, PyObject *value, void *closure)
 
 #ifdef Py_GIL_DISABLED
     PyInterpreterState *interp = _PyInterpreterState_GET();
-    // The real Py_TYPE(self) (`oldto`) may have changed from
-    // underneath us in another thread, so we stop the world.
     _PyEval_StopTheWorld(interp);
 #endif
-    PyTypeObject *oldto;
-    int res = object_set_class_world_stopped(self, newto, &oldto);
+    PyTypeObject *oldto = Py_TYPE(self);
+    int res = object_set_class_world_stopped(self, newto);
 #ifdef Py_GIL_DISABLED
     _PyEval_StartTheWorld(interp);
 #endif