From: mpage <mpage@meta.com>
Date: Mon, 15 Apr 2024 16:17:55 +0000 (-0700)
Subject: gh-117657: Quiet more TSAN warnings due to incorrect modeling of compare/exchange... 
X-Git-Tag: v3.13.0b1~418
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d5238373daea2672b56f0dae58acf158cc9aa27;p=thirdparty%2FPython%2Fcpython.git

gh-117657: Quiet more TSAN warnings due to incorrect modeling of compare/exchange (#117830)
---

diff --git a/Python/pystate.c b/Python/pystate.c
index 50454020b8fc..ac38866d301d 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);