Fix _InterlockedCompareExchange64 calls on MSVC x86

colesbury · Aug 22, 2023 · 927430d · 927430d
1 parent d70e8ae
commit 927430d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Include/cpython/pyatomic_msc.h b/Include/cpython/pyatomic_msc.h
@@ -47,7 +47,7 @@ _Py_atomic_add_int64(volatile int64_t *address, int64_t value)
     for (;;) {
         int64_t old_value = *address;
         int64_t new_value = old_value + value;
-        if (_InterlockedCompareExchange64((volatile __int64*)address, (__int64)new_value, (__int64)old_value)) {
+        if (old_value == _InterlockedCompareExchange64((volatile __int64*)address, (__int64)new_value, (__int64)old_value)) {
             return old_value;
         }
     }
@@ -230,7 +230,7 @@ _Py_atomic_exchange_int64(volatile int64_t *address, int64_t value)
     for (;;) {
         int64_t old_value = *address;
         int64_t new_value = value;
-        if (_InterlockedCompareExchange64((volatile __int64*)address, (__int64)new_value, (__int64)old_value)) {
+        if (old_value == _InterlockedCompareExchange64((volatile __int64*)address, (__int64)new_value, (__int64)old_value)) {
             return old_value;
         }
     }
@@ -322,7 +322,7 @@ _Py_atomic_and_uint64(volatile uint64_t *address, uint64_t value)
     for (;;) {
         uint64_t old_value = *address;
         uint64_t new_value = old_value & value;
-        if (_InterlockedCompareExchange64((volatile __int64*)address, (__int64)new_value, (__int64)old_value)) {
+        if (old_value == _InterlockedCompareExchange64((volatile __int64*)address, (__int64)new_value, (__int64)old_value)) {
             return old_value;
         }
     }
@@ -366,7 +366,7 @@ _Py_atomic_or_uint64(volatile uint64_t *address, uint64_t value)
     for (;;) {
         uint64_t old_value = *address;
         uint64_t new_value = old_value | value;
-        if (_InterlockedCompareExchange64((volatile __int64*)address, (__int64)new_value, (__int64)old_value)) {
+        if (old_value == _InterlockedCompareExchange64((volatile __int64*)address, (__int64)new_value, (__int64)old_value)) {
             return old_value;
         }
     }

diff --git a/Modules/_testcapi/pyatomic.c b/Modules/_testcapi/pyatomic.c
@@ -41,11 +41,11 @@ static PyObject * \
 test_atomic_add_##suffix(PyObject *self, PyObject *obj) { \
     dtype x = 0; \
     assert(_Py_atomic_add_##suffix(&x, 1) == 0); \
-    assert("a" && x == 1); \
+    assert(x == 1); \
     assert(_Py_atomic_add_##suffix(&x, 2) == 1); \
     assert(x == 3); \
     assert(_Py_atomic_add_##suffix(&x, -2) == 3); \
-    assert("b" && x == 1); \
+    assert(x == 1); \
     assert(_Py_atomic_add_##suffix(&x, -1) == 1); \
     assert(x == 0); \
     assert(_Py_atomic_add_##suffix(&x, -1) == 0); \