1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-117657: Fix data race in new_reference for free threaded build (gh-129665)

Browse Source
This commit is contained in:
Bogdan Romanyuk 2025-02-06 23:35:37 +03:00 committed by GitHub
parent 0d68b14a0d
commit 365cf5fc23
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Objects/object.c
View File

@ -2485,13 +2485,20 @@ new_reference(PyObject *op)
op->ob_refcnt = 1; op->ob_refcnt = 1;
#endif #endif
#else #else
op->ob_tid = _Py_ThreadId();
op->ob_flags = 0; op->ob_flags = 0;
op->ob_mutex = (PyMutex){ 0 }; op->ob_mutex = (PyMutex){ 0 };
#ifdef _Py_THREAD_SANITIZER
_Py_atomic_store_uintptr_relaxed(&op->ob_tid, _Py_ThreadId());
_Py_atomic_store_uint8_relaxed(&op->ob_gc_bits, 0);
_Py_atomic_store_uint32_relaxed(&op->ob_ref_local, 1);
_Py_atomic_store_ssize_relaxed(&op->ob_ref_shared, 0);
#else
op->ob_tid = _Py_ThreadId();
op->ob_gc_bits = 0; op->ob_gc_bits = 0;
op->ob_ref_local = 1; op->ob_ref_local = 1;
op->ob_ref_shared = 0; op->ob_ref_shared = 0;
#endif #endif
#endif
#ifdef Py_TRACE_REFS #ifdef Py_TRACE_REFS
_Py_AddToAllObjects(op); _Py_AddToAllObjects(op);
#endif #endif

1
Tools/tsan/suppressions_free_threading.txt
View File

@ -22,7 +22,6 @@ race:free_threadstate
# These warnings trigger directly in a CPython function. # These warnings trigger directly in a CPython function.
race_top:assign_version_tag race_top:assign_version_tag
race_top:new_reference
race_top:_multiprocessing_SemLock_acquire_impl race_top:_multiprocessing_SemLock_acquire_impl
race_top:list_get_item_ref race_top:list_get_item_ref
race_top:_Py_slot_tp_getattr_hook race_top:_Py_slot_tp_getattr_hook