size assert no work, try other with cast

Author: tom-pytel

Include/cpython/pyatomic_gcc.h

@@ -608,9 +608,9 @@ _Py_atomic_load_ssize_acquire(const Py_ssize_t *obj)
 static inline void *
 _Py_atomic_memcpy_ptr_store_relaxed(void *dest, void *src, size_t n)
 {
-    // assert(((uintptr_t)dest & (sizeof (void *) - 1)) == 0);
-    // assert(((uintptr_t)src & (sizeof (void *) - 1)) == 0);
-    assert(n % (size_t)sizeof(void *) == 0);
+    assert(((uintptr_t)dest & (uintptr_t)(sizeof (void *) - 1)) == 0);
+    assert(((uintptr_t)src & (uintptr_t)(sizeof (void *) - 1)) == 0);
+    // assert(n % sizeof(void *) == 0);
 
     // memcpy(dest, src, n);
 
@@ -631,9 +631,9 @@ _Py_atomic_memcpy_ptr_store_relaxed(void *dest, void *src, size_t n)
 static inline void *
 _Py_atomic_memmove_ptr_store_relaxed(void *dest, void *src, size_t n)
 {
-    // assert(((uintptr_t)dest & (sizeof (void *) - 1)) == 0);
-    // assert(((uintptr_t)src & (sizeof (void *) - 1)) == 0);
-    assert(n % (size_t)sizeof(void *) == 0);
+    assert(((uintptr_t)dest & (uintptr_t)(sizeof (void *) - 1)) == 0);
+    assert(((uintptr_t)src & (uintptr_t)(sizeof (void *) - 1)) == 0);
+    // assert(n % sizeof(void *) == 0);
 
     // memmove(dest, src, n);
 

Include/cpython/pyatomic_msc.h

@@ -1162,9 +1162,9 @@ _Py_atomic_load_ssize_acquire(const Py_ssize_t *obj)
 static inline void *
 _Py_atomic_memcpy_ptr_store_relaxed(void *dest, void *src, size_t n)
 {
-    // assert(((uintptr_t)dest & (sizeof (void *) - 1)) == 0);
-    // assert(((uintptr_t)src & (sizeof (void *) - 1)) == 0);
-    assert(n % (size_t)sizeof(void *) == 0);
+    assert(((uintptr_t)dest & (uintptr_t)(sizeof (void *) - 1)) == 0);
+    assert(((uintptr_t)src & (uintptr_t)(sizeof (void *) - 1)) == 0);
+    // assert(n % sizeof(void *) == 0);
 
     // memcpy(dest, src, n);
 
@@ -1185,9 +1185,9 @@ _Py_atomic_memcpy_ptr_store_relaxed(void *dest, void *src, size_t n)
 static inline void *
 _Py_atomic_memmove_ptr_store_relaxed(void *dest, void *src, size_t n)
 {
-    // assert(((uintptr_t)dest & (sizeof (void *) - 1)) == 0);
-    // assert(((uintptr_t)src & (sizeof (void *) - 1)) == 0);
-    assert(n % (size_t)sizeof(void *) == 0);
+    assert(((uintptr_t)dest & (uintptr_t)(sizeof (void *) - 1)) == 0);
+    assert(((uintptr_t)src & (uintptr_t)(sizeof (void *) - 1)) == 0);
+    // assert(n % sizeof(void *) == 0);
 
     // memmove(dest, src, n);
 

Include/cpython/pyatomic_std.h

@@ -1096,9 +1096,9 @@ static inline void *
 _Py_atomic_memcpy_ptr_store_relaxed(void *dest, void *src, size_t n)
 {
     _Py_USING_STD;
-    // assert(((uintptr_t)dest & (sizeof (void *) - 1)) == 0);
-    // assert(((uintptr_t)src & (sizeof (void *) - 1)) == 0);
-    assert(n % (size_t)sizeof(void *) == 0);
+    assert(((uintptr_t)dest & (uintptr_t)(sizeof (void *) - 1)) == 0);
+    assert(((uintptr_t)src & (uintptr_t)(sizeof (void *) - 1)) == 0);
+    // assert(n % sizeof(void *) == 0);
 
     // memcpy(dest, src, n);
 
@@ -1121,9 +1121,9 @@ static inline void *
 _Py_atomic_memmove_ptr_store_relaxed(void *dest, void *src, size_t n)
 {
     _Py_USING_STD;
-    // assert(((uintptr_t)dest & (sizeof (void *) - 1)) == 0);
-    // assert(((uintptr_t)src & (sizeof (void *) - 1)) == 0);
-    assert(n % (size_t)sizeof(void *) == 0);
+    assert(((uintptr_t)dest & (uintptr_t)(sizeof (void *) - 1)) == 0);
+    assert(((uintptr_t)src & (uintptr_t)(sizeof (void *) - 1)) == 0);
+    // assert(n % sizeof(void *) == 0);
 
     // memmove(dest, src, n);