signed long long race

Author: dpdani

Include/cpython/pyatomic.h

@@ -339,6 +339,9 @@ _Py_atomic_load_long_relaxed(const long *obj);
 static inline double
 _Py_atomic_load_double_relaxed(const double *obj);
 
+static inline long long
+_Py_atomic_load_llong_relaxed(const long long *obj);
+
 static inline int8_t
 _Py_atomic_load_int8_relaxed(const int8_t *obj);
 
@@ -523,6 +526,9 @@ _Py_atomic_store_float_release(float *obj, float value);
 static inline void
 _Py_atomic_store_double_release(double *obj, double value);
 
+static inline void
+_Py_atomic_store_llong_release(long long *obj, long long value);
+
 static inline int
 _Py_atomic_load_int_acquire(const int *obj);
 

Include/cpython/pyatomic_gcc.h

@@ -390,6 +390,10 @@ static inline unsigned long long
 _Py_atomic_load_ullong_relaxed(const unsigned long long *obj)
 { return __atomic_load_n(obj, __ATOMIC_RELAXED); }
 
+static inline long long
+_Py_atomic_load_llong_relaxed(const long long *obj)
+{ return __atomic_load_n(obj, __ATOMIC_RELAXED); }
+
 
 // --- _Py_atomic_store ------------------------------------------------------
 
@@ -568,6 +572,10 @@ static inline void
 _Py_atomic_store_double_release(double *obj, double value)
 { __atomic_store(obj, &value, __ATOMIC_RELEASE); }
 
+static inline void
+_Py_atomic_store_llong_release(long long *obj, long long value)
+{ __atomic_store_n(obj, value, __ATOMIC_RELEASE); }
+
 static inline void
 _Py_atomic_store_ssize_release(Py_ssize_t *obj, Py_ssize_t value)
 { __atomic_store_n(obj, value, __ATOMIC_RELEASE); }

Include/cpython/pyatomic_msc.h

@@ -760,6 +760,12 @@ _Py_atomic_load_ullong_relaxed(const unsigned long long *obj)
     return *(volatile unsigned long long *)obj;
 }
 
+static inline long long
+_Py_atomic_load_llong_relaxed(const long long *obj)
+{
+    return *(volatile long long *)obj;
+}
+
 
 // --- _Py_atomic_store ------------------------------------------------------
 
@@ -1110,6 +1116,19 @@ _Py_atomic_store_double_release(double *obj, double value)
 #endif
 }
 
+static inline void
+_Py_atomic_store_llong_release(long long *obj, long long value)
+{
+#if defined(_M_X64) || defined(_M_IX86)
+    *(long long volatile *)obj = value;
+#elif defined(_M_ARM64)
+    _Py_atomic_ASSERT_ARG_TYPE(unsigned __int128);
+    __stlr128((unsigned __int128 volatile *)obj, (unsigned __int128)value);
+#else
+#  error "no implementation of _Py_atomic_store_llong_release"
+#endif
+}
+
 static inline void
 _Py_atomic_store_ssize_release(Py_ssize_t *obj, Py_ssize_t value)
 {

Include/cpython/pyatomic_std.h

@@ -683,6 +683,14 @@ _Py_atomic_load_ullong_relaxed(const unsigned long long *obj)
                                 memory_order_relaxed);
 }
 
+static inline long long
+_Py_atomic_load_llong_relaxed(const long long *obj)
+{
+    _Py_USING_STD;
+    return atomic_load_explicit((const _Atomic(long long)*)obj,
+                                memory_order_relaxed);
+}
+
 
 // --- _Py_atomic_store ------------------------------------------------------
 
@@ -1015,6 +1023,14 @@ _Py_atomic_store_double_release(double *obj, double value)
                           memory_order_release);
 }
 
+static inline void
+_Py_atomic_store_llong_release(long long *obj, long long value)
+{
+    _Py_USING_STD;
+    atomic_store_explicit((_Atomic(long long)*)obj, value,
+                          memory_order_release);
+}
+
 static inline void
 _Py_atomic_store_ssize_release(Py_ssize_t *obj, Py_ssize_t value)
 {

Include/internal/pycore_pyatomic_ft_wrappers.h

@@ -101,6 +101,10 @@ extern "C" {
     _Py_atomic_store_double_release(&value, new_value)
 #define FT_ATOMIC_LOAD_DOUBLE_RELAXED(value) \
     _Py_atomic_load_double_relaxed(&value)
+#define FT_ATOMIC_STORE_LLONG_RELEASE(value, new_value) \
+    _Py_atomic_store_llong_release(&value, new_value)
+#define FT_ATOMIC_LOAD_LLONG_RELAXED(value) \
+    _Py_atomic_load_llong_relaxed(&value)
 
 #else
 #define FT_ATOMIC_LOAD_PTR(value) value
@@ -144,6 +148,8 @@ extern "C" {
 #define FT_ATOMIC_STORE_FLOAT_RELEASE(value, new_value) value = new_value
 #define FT_ATOMIC_LOAD_DOUBLE_RELAXED(value) value
 #define FT_ATOMIC_STORE_DOUBLE_RELEASE(value, new_value) value = new_value
+#define FT_ATOMIC_LOAD_LLONG_RELAXED(value) value
+#define FT_ATOMIC_STORE_LLONG_RELEASE(value, new_value) value = new_value
 
 #endif
 

Python/structmember.c

@@ -107,7 +107,7 @@ PyMember_GetOne(const char *obj_addr, PyMemberDef *l)
 #endif
         break;
     case Py_T_LONGLONG:
-        v = PyLong_FromLongLong(*(long long *)addr);
+        v = PyLong_FromLongLong(FT_ATOMIC_LOAD_LLONG_RELAXED(*(long long *)addr));
         break;
     case Py_T_ULONGLONG:
         v = PyLong_FromUnsignedLongLong(*(unsigned long long *)addr);
@@ -329,8 +329,8 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
         PyErr_SetString(PyExc_TypeError, "readonly attribute");
         return -1;
     case Py_T_LONGLONG:{
-        long long value;
-        *(long long*)addr = value = PyLong_AsLongLong(v);
+        long long value = PyLong_AsLongLong(v);
+        FT_ATOMIC_STORE_LLONG_RELEASE(*(long long*)addr, value);
         if ((value == -1) && PyErr_Occurred())
             return -1;
         break;