self-review

dpdani · May 21, 2024 · 419929d · 419929d
1 parent 7aa0396
commit 419929d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Python/structmember.c b/Python/structmember.c
@@ -298,9 +298,14 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
         break;
     case _Py_T_OBJECT:
     case Py_T_OBJECT_EX:
+#ifndef Py_GIL_DISABLED
+        oldv = *(PyObject **)addr;
+        *(PyObject **)addr = Py_XNewRef(v);
+#else
         _PyObject_SetMaybeWeakref(v);  // without setting _Py_REF_MAYBE_WEAKREF,
         // we may get an infinite loop in PyMember_GetOne
         oldv = FT_ATOMIC_EXCHANGE_PTR(addr, Py_XNewRef(v));
+#endif
         Py_XDECREF(oldv);
         break;
     case Py_T_CHAR: {

diff --git a/Tools/tsan/suppressions_free_threading.txt b/Tools/tsan/suppressions_free_threading.txt
@@ -30,7 +30,7 @@ race:_PyParkingLot_Park
 race_top:_add_to_weak_set
 race_top:_in_weak_set
 race_top:_mi_heap_delayed_free_partial
-#race_top:_PyEval_EvalFrameDefault
+race_top:_PyEval_EvalFrameDefault
 race_top:_PyImport_AcquireLock
 race_top:_PyImport_ReleaseLock
 # https://gist.github.com/mpage/0a24eb2dd458441ededb498e9b0e5de8