misc

Author: tom-pytel

Modules/arraymodule.c

@@ -197,6 +197,24 @@ arraydata_set_items(arraydata *data, char *newitems, Py_ssize_t newsize, int ite
     return data;
 }
 
+#ifndef Py_GIL_DISABLED
+
+static arraydata *
+arraydata_realloc(arraydata *data, Py_ssize_t size, int itemsize)
+{
+    if (size > PY_SSIZE_T_MAX/itemsize - 1) {
+        return NULL;
+    }
+    data = (arraydata *)PyMem_Realloc(data, sizeof(arraydata) + size * itemsize);
+    if (data == NULL) {
+        return NULL;
+    }
+    data->allocated = size;
+    return data;
+}
+
+#endif
+
 #ifdef Py_GIL_DISABLED
 
 static void
@@ -205,25 +223,25 @@ atomic_itemcpy(void *dest, const void *src, size_t n, int itemsize)
     if (itemsize == 1) {
         for (char *d = (char *) dest, *end = d + n, *s = (char *) src;
              d < end; d++, s++) {
-            _Py_atomic_store_char_relaxed(d, _Py_atomic_load_char_relaxed(s));
+            *d = _Py_atomic_load_char_relaxed(s);
         }
     }
     else if (itemsize == 2) {
         for (short *d = (short *) dest, *end = d + n, *s = (short *) src;
              d < end; d++, s++) {
-            _Py_atomic_store_short_relaxed(d, _Py_atomic_load_short_relaxed(s));
+            *d = _Py_atomic_load_short_relaxed(s);
         }
     }
     else if (itemsize == 4) {
         for (PY_UINT32_T *d = (PY_UINT32_T *) dest, *end = d + n, *s = (PY_UINT32_T *) src;
              d < end; d++, s++) {
-            _Py_atomic_store_uint32_relaxed(d, _Py_atomic_load_uint32_relaxed(s));
+            *d = (PY_UINT32_T) _Py_atomic_load_uint32_relaxed(s);
         }
     }
     else if (itemsize == 8) {
         for (PY_UINT64_T *d = (PY_UINT64_T *) dest, *end = d + n, *s = (PY_UINT64_T *) src;
              d < end; d++, s++) {
-            _Py_atomic_store_uint64_relaxed(d, _Py_atomic_load_uint64_relaxed(s));
+            *d = (PY_UINT64_T) _Py_atomic_load_uint64_relaxed(s);
         }
     }
     else {
@@ -233,24 +251,6 @@ atomic_itemcpy(void *dest, const void *src, size_t n, int itemsize)
 
 #endif
 
-#ifndef Py_GIL_DISABLED
-
-static arraydata *
-arraydata_realloc(arraydata *data, Py_ssize_t size, int itemsize)
-{
-    if (size > PY_SSIZE_T_MAX/itemsize - 1) {
-        return NULL;
-    }
-    data = (arraydata *)PyMem_Realloc(data, sizeof(arraydata) + size * itemsize);
-    if (data == NULL) {
-        return NULL;
-    }
-    data->allocated = size;
-    return data;
-}
-
-#endif
-
 static int
 array_resize(arrayobject *self, Py_ssize_t newsize)
 {