remove atomic load and rename

Author: tom-pytel

Include/cpython/pyatomic.h

@@ -548,7 +548,7 @@ _Py_atomic_load_ssize_acquire(const Py_ssize_t *obj);
 // --- _Py_atomic_memcpy / _Py_atomic_memmove ------------
 
 static inline void *
-_Py_atomic_memcpy_ptr_relaxed(void *dest, void *src, Py_ssize_t sn)
+_Py_atomic_memcpy_ptr_store_relaxed(void *dest, void *src, Py_ssize_t sn)
 {
     size_t n = (size_t)sn;
     assert(((uintptr_t)dest & (sizeof (void *) - 1)) == 0);
@@ -561,16 +561,15 @@ _Py_atomic_memcpy_ptr_relaxed(void *dest, void *src, Py_ssize_t sn)
         void **e = d + n / sizeof(void *);
 
         for (; d != e; d++, s++) {
-            void *v = _Py_atomic_load_ptr_relaxed(s);
-            _Py_atomic_store_ptr_relaxed(d, v);
+            _Py_atomic_store_ptr_relaxed(d, *s);
         }
     }
 
     return dest;
 }
 
 static inline void *
-_Py_atomic_memmove_ptr_relaxed(void *dest, void *src, Py_ssize_t sn)
+_Py_atomic_memmove_ptr_store_relaxed(void *dest, void *src, Py_ssize_t sn)
 {
     size_t n = (size_t)sn;
     assert(((uintptr_t)dest & (sizeof (void *) - 1)) == 0);
@@ -583,8 +582,7 @@ _Py_atomic_memmove_ptr_relaxed(void *dest, void *src, Py_ssize_t sn)
         void **e = d + n / sizeof(void *);
 
         for (; d != e; d++, s++) {
-            void *v = _Py_atomic_load_ptr_relaxed(s);
-            _Py_atomic_store_ptr_relaxed(d, v);
+            _Py_atomic_store_ptr_relaxed(d, *s);
         }
     }
     else if (dest > src) {
@@ -594,8 +592,7 @@ _Py_atomic_memmove_ptr_relaxed(void *dest, void *src, Py_ssize_t sn)
         void **e = (void **)dest - 1;
 
         for (; d != e; d--, s--) {
-            void *v = _Py_atomic_load_ptr_relaxed(s);
-            _Py_atomic_store_ptr_relaxed(d, v);
+            _Py_atomic_store_ptr_relaxed(d, *s);
         }
     }
 

Include/internal/pycore_list.h

@@ -60,7 +60,7 @@ _Py_memory_ptrs_repeat(char* dest, Py_ssize_t len_dest, Py_ssize_t len_src)
     Py_ssize_t copied = len_src;
     while (copied < len_dest) {
         Py_ssize_t bytes_to_copy = Py_MIN(copied, len_dest - copied);
-        FT_ATOMIC_MEMCPY_PTR_RELAXED(dest + copied, dest, (size_t)bytes_to_copy);
+        FT_ATOMIC_MEMCPY_PTR_STORE_RELAXED(dest + copied, dest, (size_t)bytes_to_copy);
         copied += bytes_to_copy;
     }
 }

Include/internal/pycore_pyatomic_ft_wrappers.h

@@ -110,10 +110,10 @@ extern "C" {
 #define FT_ATOMIC_LOAD_ULLONG_RELAXED(value) \
     _Py_atomic_load_ullong_relaxed(&value)
 
-#define FT_ATOMIC_MEMCPY_PTR_RELAXED(dest, src, n) \
-    _Py_atomic_memcpy_ptr_relaxed(dest, src, (Py_ssize_t)(n))
-#define FT_ATOMIC_MEMMOVE_PTR_RELAXED(dest, src, n) \
-    _Py_atomic_memmove_ptr_relaxed(dest, src, (Py_ssize_t)(n))
+#define FT_ATOMIC_MEMCPY_PTR_STORE_RELAXED(dest, src, n) \
+    _Py_atomic_memcpy_ptr_store_relaxed(dest, src, (Py_ssize_t)(n))
+#define FT_ATOMIC_MEMMOVE_PTR_STORE_RELAXED(dest, src, n) \
+    _Py_atomic_memmove_ptr_store_relaxed(dest, src, (Py_ssize_t)(n))
 
 
 #else
@@ -163,8 +163,8 @@ extern "C" {
 #define FT_ATOMIC_LOAD_ULLONG_RELAXED(value) value
 #define FT_ATOMIC_STORE_ULLONG_RELAXED(value, new_value) value = new_value
 
-#define FT_ATOMIC_MEMCPY_PTR_RELAXED(dest, src, n) memcpy(dest, src, n)
-#define FT_ATOMIC_MEMMOVE_PTR_RELAXED(dest, src, n) memmove(dest, src, n)
+#define FT_ATOMIC_MEMCPY_PTR_STORE_RELAXED(dest, src, n) memcpy(dest, src, n)
+#define FT_ATOMIC_MEMMOVE_PTR_STORE_RELAXED(dest, src, n) memmove(dest, src, n)
 
 #endif
 

Objects/listobject.c

@@ -947,10 +947,10 @@ list_ass_slice_lock_held(PyListObject *a, Py_ssize_t ilow, Py_ssize_t ihigh, PyO
     if (d < 0) { /* Delete -d items */
         Py_ssize_t tail;
         tail = (Py_SIZE(a) - ihigh) * sizeof(PyObject *);
-        FT_ATOMIC_MEMMOVE_PTR_RELAXED(&item[ihigh+d], &item[ihigh], tail);
+        FT_ATOMIC_MEMMOVE_PTR_STORE_RELAXED(&item[ihigh+d], &item[ihigh], tail);
         if (list_resize(a, Py_SIZE(a) + d) < 0) {
-            FT_ATOMIC_MEMMOVE_PTR_RELAXED(&item[ihigh], &item[ihigh+d], tail);
-            FT_ATOMIC_MEMCPY_PTR_RELAXED(&item[ilow], recycle, s);
+            FT_ATOMIC_MEMMOVE_PTR_STORE_RELAXED(&item[ihigh], &item[ihigh+d], tail);
+            FT_ATOMIC_MEMCPY_PTR_STORE_RELAXED(&item[ilow], recycle, s);
             goto Error;
         }
         item = a->ob_item;
@@ -960,8 +960,8 @@ list_ass_slice_lock_held(PyListObject *a, Py_ssize_t ilow, Py_ssize_t ihigh, PyO
         if (list_resize(a, k+d) < 0)
             goto Error;
         item = a->ob_item;
-        FT_ATOMIC_MEMMOVE_PTR_RELAXED(&item[ihigh+d], &item[ihigh],
-                                      (k - ihigh)*sizeof(PyObject *));
+        FT_ATOMIC_MEMMOVE_PTR_STORE_RELAXED(&item[ihigh+d], &item[ihigh],
+                                            (k - ihigh)*sizeof(PyObject *));
     }
     for (k = 0; k < n; k++, ilow++) {
         PyObject *w = vitem[k];