Remove tsan fixes pending https://github.com/colesbury/cpython/tree/gh-142534-consume

Author: DinoV

Objects/object.c

@@ -2682,8 +2682,8 @@ _Py_SetImmortalUntracked(PyObject *op)
     }
 #ifdef Py_GIL_DISABLED
     op->ob_tid = _Py_UNOWNED_TID;
-    _Py_atomic_store_uint32_relaxed(&op->ob_ref_local, _Py_IMMORTAL_REFCNT_LOCAL);
-    _Py_atomic_store_ssize_relaxed(&op->ob_ref_shared, 0);
+    op->ob_ref_local = _Py_IMMORTAL_REFCNT_LOCAL;
+    op->ob_ref_shared = 0;
     _Py_atomic_or_uint8(&op->ob_gc_bits, _PyGC_BITS_DEFERRED);
 #elif SIZEOF_VOID_P > 4
     op->ob_flags = _Py_IMMORTAL_FLAGS;

Objects/unicodeobject.c

@@ -1329,7 +1329,7 @@ PyUnicode_New(Py_ssize_t size, Py_UCS4 maxchar)
     else
         data = unicode + 1;
     _PyUnicode_LENGTH(unicode) = size;
-    PyUnicode_SET_HASH((PyObject *)unicode, -1);
+    _PyUnicode_HASH(unicode) = -1;
     _PyUnicode_STATE(unicode).interned = 0;
     _PyUnicode_STATE(unicode).kind = kind;
     _PyUnicode_STATE(unicode).compact = 1;
@@ -13903,9 +13903,9 @@ unicode_subtype_new(PyTypeObject *type, PyObject *unicode)
 
     _PyUnicode_LENGTH(self) = length;
 #ifdef Py_DEBUG
-    PyUnicode_SET_HASH((PyObject *)self, -1);
+    _PyUnicode_HASH(self) = -1;
 #else
-    PyUnicode_SET_HASH((PyObject *)self, PyUnicode_HASH(unicode));
+    _PyUnicode_HASH(self) = _PyUnicode_HASH(unicode);
 #endif
     _PyUnicode_STATE(self).interned = 0;
     _PyUnicode_STATE(self).kind = kind;
@@ -13950,7 +13950,7 @@ unicode_subtype_new(PyTypeObject *type, PyObject *unicode)
     memcpy(data, PyUnicode_DATA(unicode), kind * (length + 1));
     assert(_PyUnicode_CheckConsistency(self, 1));
 #ifdef Py_DEBUG
-    PyUnicode_SET_HASH((PyObject *)self, PyUnicode_HASH(unicode));
+    _PyUnicode_HASH(self) = _PyUnicode_HASH(unicode);
 #endif
     return self;