gh-117657: TSAN Fix races in PyMember_Get and PyMember_Set, for C extensions

Include/cpython/pyatomic.h

@@ -321,6 +321,27 @@ _Py_atomic_load_ptr(const void *obj);
 static inline int
 _Py_atomic_load_int_relaxed(const int *obj);
 
+static inline char
+_Py_atomic_load_char_relaxed(const char *obj);
+
+static inline unsigned char
+_Py_atomic_load_uchar_relaxed(const unsigned char *obj);
+
+static inline short
+_Py_atomic_load_short_relaxed(const short *obj);
+
+static inline unsigned short
+_Py_atomic_load_ushort_relaxed(const unsigned short *obj);
+
+static inline long
+_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);
 
@@ -481,6 +502,37 @@ _Py_atomic_store_ssize_release(Py_ssize_t *obj, Py_ssize_t value);
 static inline void
 _Py_atomic_store_int_release(int *obj, int value);
 
+static inline void
+_Py_atomic_store_char_release(char *obj, char value);
+
+static inline void
+_Py_atomic_store_uchar_release(unsigned char *obj, unsigned char value);
+
+static inline void
+_Py_atomic_store_short_release(short *obj, short value);
+
+static inline void
+_Py_atomic_store_ushort_release(unsigned short *obj, unsigned short value);
+
+static inline void
+_Py_atomic_store_uint_release(unsigned int *obj, unsigned int value);
+
+static inline void
+_Py_atomic_store_long_release(long *obj, long value);
+
+static inline void
+_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 void
+_Py_atomic_store_ullong_release(unsigned long long *obj,
+                                unsigned long long value);
+
 static inline int
 _Py_atomic_load_int_acquire(const int *obj);
 

Include/cpython/pyatomic_gcc.h

@@ -306,6 +306,34 @@ static inline int
 _Py_atomic_load_int_relaxed(const int *obj)
 { return __atomic_load_n(obj, __ATOMIC_RELAXED); }
 
+static inline char
+_Py_atomic_load_char_relaxed(const char *obj)
+{ return __atomic_load_n(obj, __ATOMIC_RELAXED); }
+
+static inline unsigned char
+_Py_atomic_load_uchar_relaxed(const unsigned char *obj)
+{ return __atomic_load_n(obj, __ATOMIC_RELAXED); }
+
+static inline short
+_Py_atomic_load_short_relaxed(const short *obj)
+{ return __atomic_load_n(obj, __ATOMIC_RELAXED); }
+
+static inline unsigned short
+_Py_atomic_load_ushort_relaxed(const unsigned short *obj)
+{ return __atomic_load_n(obj, __ATOMIC_RELAXED); }
+
+static inline long
+_Py_atomic_load_long_relaxed(const long *obj)
+{ return __atomic_load_n(obj, __ATOMIC_RELAXED); }
+
+static inline float
+_Py_atomic_load_float_relaxed(const float *obj)
+{ float ret; __atomic_load(obj, &ret, __ATOMIC_RELAXED); return ret; }
+
+static inline double
+_Py_atomic_load_double_relaxed(const double *obj)
+{ double ret; __atomic_load(obj, &ret, __ATOMIC_RELAXED); return ret; }
+
 static inline int8_t
 _Py_atomic_load_int8_relaxed(const int8_t *obj)
 { return __atomic_load_n(obj, __ATOMIC_RELAXED); }
@@ -362,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 ------------------------------------------------------
 
@@ -508,6 +540,47 @@ static inline void
 _Py_atomic_store_int_release(int *obj, int value)
 { __atomic_store_n(obj, value, __ATOMIC_RELEASE); }
 
+static inline void
+_Py_atomic_store_char_release(char *obj, char value)
+{ __atomic_store_n(obj, value, __ATOMIC_RELEASE); }
+
+static inline void
+_Py_atomic_store_uchar_release(unsigned char *obj, unsigned char value)
+{ __atomic_store_n(obj, value, __ATOMIC_RELEASE); }
+
+static inline void
+_Py_atomic_store_short_release(short *obj, short value)
+{ __atomic_store_n(obj, value, __ATOMIC_RELEASE); }
+
+static inline void
+_Py_atomic_store_ushort_release(unsigned short *obj, unsigned short value)
+{ __atomic_store_n(obj, value, __ATOMIC_RELEASE); }
+
+static inline void
+_Py_atomic_store_uint_release(unsigned int *obj, unsigned int value)
+{ __atomic_store_n(obj, value, __ATOMIC_RELEASE); }
+
+static inline void
+_Py_atomic_store_long_release(long *obj, long value)
+{ __atomic_store_n(obj, value, __ATOMIC_RELEASE); }
+
+static inline void
+_Py_atomic_store_float_release(float *obj, float value)
+{ __atomic_store(obj, &value, __ATOMIC_RELEASE); }
+
+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_ullong_release(unsigned long long *obj,
+                                unsigned 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

@@ -634,6 +634,48 @@ _Py_atomic_load_int_relaxed(const int *obj)
     return *(volatile int *)obj;
 }
 
+static inline char
+_Py_atomic_load_char_relaxed(const char *obj)
+{
+    return *(volatile char *)obj;
+}
+
+static inline unsigned char
+_Py_atomic_load_uchar_relaxed(const unsigned char *obj)
+{
+    return *(volatile unsigned char *)obj;
+}
+
+static inline short
+_Py_atomic_load_short_relaxed(const short *obj)
+{
+    return *(volatile short *)obj;
+}
+
+static inline unsigned short
+_Py_atomic_load_ushort_relaxed(const unsigned short *obj)
+{
+    return *(volatile unsigned short *)obj;
+}
+
+static inline long
+_Py_atomic_load_long_relaxed(const long *obj)
+{
+    return *(volatile long *)obj;
+}
+
+static inline float
+_Py_atomic_load_float_relaxed(const float *obj)
+{
+    return *(volatile float *)obj;
+}
+
+static inline double
+_Py_atomic_load_double_relaxed(const double *obj)
+{
+    return *(volatile double *)obj;
+}
+
 static inline int8_t
 _Py_atomic_load_int8_relaxed(const int8_t *obj)
 {
@@ -718,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 ------------------------------------------------------
 
@@ -964,6 +1012,136 @@ _Py_atomic_store_int_release(int *obj, int value)
 #endif
 }
 
+static inline void
+_Py_atomic_store_char_release(char *obj, char value)
+{
+#if defined(_M_X64) || defined(_M_IX86)
+    *(char volatile *)obj = value;
+#elif defined(_M_ARM64)
+    _Py_atomic_ASSERT_ARG_TYPE(unsigned __int8);
+    __stlr8((unsigned __int8 volatile *)obj, (unsigned __int8)value);
+#else
+#  error "no implementation of _Py_atomic_store_char_release"
+#endif
+}
+
+static inline void
+_Py_atomic_store_uchar_release(unsigned char *obj, unsigned char value)
+{
+#if defined(_M_X64) || defined(_M_IX86)
+    *(unsigned char volatile *)obj = value;
+#elif defined(_M_ARM64)
+    _Py_atomic_ASSERT_ARG_TYPE(unsigned __int8);
+    __stlr8((unsigned __int8 volatile *)obj, (unsigned __int8)value);
+#else
+#  error "no implementation of _Py_atomic_store_uchar_release"
+#endif
+}
+
+static inline void
+_Py_atomic_store_short_release(short *obj, short value)
+{
+#if defined(_M_X64) || defined(_M_IX86)
+    *(short volatile *)obj = value;
+#elif defined(_M_ARM64)
+    _Py_atomic_ASSERT_ARG_TYPE(unsigned __int16);
+    __stlr16((unsigned __int16 volatile *)obj, (unsigned __int16)value);
+#else
+#  error "no implementation of _Py_atomic_store_short_release"
+#endif
+}
+
+static inline void
+_Py_atomic_store_ushort_release(unsigned short *obj, unsigned short value)
+{
+#if defined(_M_X64) || defined(_M_IX86)
+    *(unsigned short volatile *)obj = value;
+#elif defined(_M_ARM64)
+    _Py_atomic_ASSERT_ARG_TYPE(unsigned __int16);
+    __stlr16((unsigned __int16 volatile *)obj, (unsigned __int16)value);
+#else
+#  error "no implementation of _Py_atomic_store_ushort_release"
+#endif
+}
+
+static inline void
+_Py_atomic_store_uint_release(unsigned int *obj, unsigned int value)
+{
+#if defined(_M_X64) || defined(_M_IX86)
+    *(unsigned int volatile *)obj = value;
+#elif defined(_M_ARM64)
+    _Py_atomic_ASSERT_ARG_TYPE(unsigned __int32);
+    __stlr32((unsigned __int32 volatile *)obj, (unsigned __int32)value);
+#else
+#  error "no implementation of _Py_atomic_store_uint_release"
+#endif
+}
+
+static inline void
+_Py_atomic_store_long_release(long *obj, long value)
+{
+#if defined(_M_X64) || defined(_M_IX86)
+    *(long volatile *)obj = value;
+#elif defined(_M_ARM64)
+    _Py_atomic_ASSERT_ARG_TYPE(unsigned __int32);
+    __stlr32((unsigned __int32 volatile *)obj, (unsigned __int32)value);
+#else
+#  error "no implementation of _Py_atomic_store_long_release"
+#endif
+}
+
+static inline void
+_Py_atomic_store_float_release(float *obj, float value)
+{
+#if defined(_M_X64) || defined(_M_IX86)
+    *(float volatile *)obj = value;
+#elif defined(_M_ARM64)
+    _Py_atomic_ASSERT_ARG_TYPE(unsigned __int32);
+    __stlr32((unsigned __int32 volatile *)obj, (unsigned __int32)value);
+#else
+#  error "no implementation of _Py_atomic_store_float_release"
+#endif
+}
+
+static inline void
+_Py_atomic_store_double_release(double *obj, double value)
+{
+#if defined(_M_X64) || defined(_M_IX86)
+    *(double volatile *)obj = value;
+#elif defined(_M_ARM64)
+    _Py_atomic_ASSERT_ARG_TYPE(unsigned __int64);
+    __stlr64((unsigned __int64 volatile *)obj, (unsigned __int64)value);
+#else
+#  error "no implementation of _Py_atomic_store_double_release"
+#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 __int64);
+    __stlr64((unsigned __int64 volatile *)obj, (unsigned __int64)value);
+#else
+#  error "no implementation of _Py_atomic_store_llong_release"
+#endif
+}
+
+static inline void
+_Py_atomic_store_ullong_release(unsigned long long *obj, unsigned long long value)
+{
+#if defined(_M_X64) || defined(_M_IX86)
+    *(unsigned long long volatile *)obj = value;
+#elif defined(_M_ARM64)
+    _Py_atomic_ASSERT_ARG_TYPE(__int64);
+    __stlr64((unsigned __int64 volatile *)obj, (unsigned __int64)value);
+#else
+#  error "no implementation of _Py_atomic_store_ullong_release"
+#endif
+}
+
 static inline void
 _Py_atomic_store_ssize_release(Py_ssize_t *obj, Py_ssize_t value)
 {