Merge branch 'main' into main

Jamesgo1 · Sep 29, 2023 · 313844e · 313844e
2 parents b0a58a1 + 20bc5f7
commit 313844e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/Include/cpython/pyatomic.h b/Include/cpython/pyatomic.h
@@ -506,15 +506,23 @@ static inline void _Py_atomic_fence_release(void);
 // --- aliases ---------------------------------------------------------------
 
 #if SIZEOF_LONG == 8
-# define _Py_atomic_load_ulong _Py_atomic_load_uint64
-# define _Py_atomic_load_ulong_relaxed _Py_atomic_load_uint64_relaxed
-# define _Py_atomic_store_ulong _Py_atomic_store_uint64
-# define _Py_atomic_store_ulong_relaxed _Py_atomic_store_uint64_relaxed
+# define _Py_atomic_load_ulong(p) \
+    _Py_atomic_load_uint64((uint64_t *)p)
+# define _Py_atomic_load_ulong_relaxed(p) \
+    _Py_atomic_load_uint64_relaxed((uint64_t *)p)
+# define _Py_atomic_store_ulong(p, v) \
+    _Py_atomic_store_uint64((uint64_t *)p, v)
+# define _Py_atomic_store_ulong_relaxed(p, v) \
+    _Py_atomic_store_uint64_relaxed((uint64_t *)p, v)
 #elif SIZEOF_LONG == 4
-# define _Py_atomic_load_ulong _Py_atomic_load_uint32
-# define _Py_atomic_load_ulong_relaxed _Py_atomic_load_uint32_relaxed
-# define _Py_atomic_store_ulong _Py_atomic_store_uint32
-# define _Py_atomic_store_ulong_relaxed _Py_atomic_store_uint32_relaxed
+# define _Py_atomic_load_ulong(p) \
+    _Py_atomic_load_uint32((uint32_t *)p)
+# define _Py_atomic_load_ulong_relaxed(p) \
+    _Py_atomic_load_uint32_relaxed((uint32_t *)p)
+# define _Py_atomic_store_ulong(p, v) \
+    _Py_atomic_store_uint32((uint32_t *)p, v)
+# define _Py_atomic_store_ulong_relaxed(p, v) \
+    _Py_atomic_store_uint32_relaxed((uint32_t *)p, v)
 #else
 # error "long must be 4 or 8 bytes in size"
 #endif  // SIZEOF_LONG
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
@@ -812,7 +812,9 @@ def test_copy_python_src_ignore(self):
         if not os.path.exists(src_dir):
             self.skipTest(f"cannot access Python source code directory:"
                           f" {src_dir!r}")
-        landmark = os.path.join(src_dir, 'Lib', 'os.py')
+        # Check that the landmark copy_python_src_ignore() expects is available
+        # (Previously we looked for 'Lib\os.py', which is always present on Windows.)
+        landmark = os.path.join(src_dir, 'Modules')
         if not os.path.exists(landmark):
             self.skipTest(f"cannot access Python source code directory:"
                           f" {landmark!r} landmark is missing")