diff --git a/Lib/test/test_free_threading/test_type.py b/Lib/test/test_free_threading/test_type.py
index ae996e7db3c7fd..2d995751005d71 100644
--- a/Lib/test/test_free_threading/test_type.py
+++ b/Lib/test/test_free_threading/test_type.py
@@ -127,6 +127,20 @@ class ClassB(Base):
obj.__class__ = ClassB
+ def test_name_change(self):
+ class Foo:
+ pass
+
+ def writer():
+ for _ in range(1000):
+ Foo.__name__ = 'Bar'
+
+ def reader():
+ for _ in range(1000):
+ Foo.__name__
+
+ self.run_one(writer, reader)
+
def run_one(self, writer_func, reader_func):
barrier = threading.Barrier(NTHREADS)
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index ab6ad1fe8b5f91..7a2cc68876d76b 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -1434,9 +1434,13 @@ type_set_name(PyObject *tp, PyObject *value, void *Py_UNUSED(closure))
return -1;
}
+ PyInterpreterState *interp = _PyInterpreterState_GET();
+ _PyEval_StopTheWorld(interp);
type->tp_name = tp_name;
- Py_SETREF(((PyHeapTypeObject*)type)->ht_name, Py_NewRef(value));
-
+ PyObject *old_name = ((PyHeapTypeObject*)type)->ht_name;
+ ((PyHeapTypeObject*)type)->ht_name = Py_NewRef(value);
+ _PyEval_StartTheWorld(interp);
+ Py_DECREF(old_name);
return 0;
}
@@ -10403,9 +10407,11 @@ slot_tp_descr_get(PyObject *self, PyObject *obj, PyObject *type)
get = _PyType_LookupRef(tp, &_Py_ID(__get__));
if (get == NULL) {
+#ifndef Py_GIL_DISABLED
/* Avoid further slowdowns */
if (tp->tp_descr_get == slot_tp_descr_get)
tp->tp_descr_get = NULL;
+#endif
return Py_NewRef(self);
}
if (obj == NULL)
diff --git a/Tools/tsan/suppressions_free_threading.txt b/Tools/tsan/suppressions_free_threading.txt
index 3230f969436c82..2795ee1ba4c45c 100644
--- a/Tools/tsan/suppressions_free_threading.txt
+++ b/Tools/tsan/suppressions_free_threading.txt
@@ -51,7 +51,5 @@ race:PyObject_Realloc
# gh-133467. Some of these could be hard to trigger.
race_top:update_one_slot
race_top:_Py_slot_tp_getattr_hook
-race_top:slot_tp_descr_get
-race_top:type_set_name
race_top:set_tp_bases
race_top:type_set_bases_unlocked
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy