From 0d5238373daea2672b56f0dae58acf158cc9aa27 Mon Sep 17 00:00:00 2001 From: mpage Date: Mon, 15 Apr 2024 09:17:55 -0700 Subject: gh-117657: Quiet more TSAN warnings due to incorrect modeling of compare/exchange (#117830) --- Python/pystate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Python/pystate.c b/Python/pystate.c index 5045402..ac38866 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -2003,7 +2003,7 @@ tstate_try_attach(PyThreadState *tstate) static void tstate_set_detached(PyThreadState *tstate, int detached_state) { - assert(tstate->state == _Py_THREAD_ATTACHED); + assert(_Py_atomic_load_int_relaxed(&tstate->state) == _Py_THREAD_ATTACHED); #ifdef Py_GIL_DISABLED _Py_atomic_store_int(&tstate->state, detached_state); #else @@ -2068,7 +2068,7 @@ static void detach_thread(PyThreadState *tstate, int detached_state) { // XXX assert(tstate_is_alive(tstate) && tstate_is_bound(tstate)); - assert(tstate->state == _Py_THREAD_ATTACHED); + assert(_Py_atomic_load_int_relaxed(&tstate->state) == _Py_THREAD_ATTACHED); assert(tstate == current_fast_get()); if (tstate->critical_section != 0) { _PyCriticalSection_SuspendAll(tstate); -- cgit v0.12