Clean-up post merge

Author: colesbury

Include/internal/pycore_pyatomic_ft_wrappers.h

@@ -137,12 +137,6 @@ extern "C" {
     _Py_atomic_load_ullong_relaxed(&value)
 #define FT_ATOMIC_ADD_SSIZE(value, new_value) \
     (void)_Py_atomic_add_ssize(&value, new_value)
-#define FT_ATOMIC_ADD_UINT64(value, new_value) \
-    (void)_Py_atomic_add_uint64(&value, new_value)
-#define FT_ATOMIC_OR_UINT64(value, new_value) \
-    (void)_Py_atomic_or_uint64(&value, new_value)
-#define FT_ATOMIC_AND_UINT64(value, new_value) \
-    (void)_Py_atomic_and_uint64(&value, new_value)
 #define FT_MUTEX_LOCK(lock) PyMutex_Lock(lock)
 #define FT_MUTEX_LOCK_FLAGS(lock, flags) PyMutex_LockFlags(lock, flags)
 #define FT_MUTEX_UNLOCK(lock) PyMutex_Unlock(lock)
@@ -207,9 +201,6 @@ 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_ADD_SSIZE(value, new_value) (void)(value += new_value)
-#define FT_ATOMIC_ADD_UINT64(value, new_value) (void)(value += new_value)
-#define FT_ATOMIC_OR_UINT64(value, new_value) (void)(value |= new_value)
-#define FT_ATOMIC_AND_UINT64(value, new_value) (void)(value &= new_value)
 #define FT_MUTEX_LOCK(lock) do {} while (0)
 #define FT_MUTEX_LOCK_FLAGS(lock, flags) do {} while (0)
 #define FT_MUTEX_UNLOCK(lock) do {} while (0)

Python/optimizer_analysis.c

@@ -18,7 +18,7 @@
 #include "pycore_opcode_metadata.h"
 #include "pycore_opcode_utils.h"
 #include "pycore_pystate.h"       // _PyInterpreterState_GET()
-#include "pycore_pyatomic_ft_wrappers.h" // FT_MUTEX_LOCK/UNLOCK
+#include "pycore_pyatomic_ft_wrappers.h" // FT_ATOMIC_*
 #include "pycore_tstate.h"        // _PyThreadStateImpl
 #include "pycore_uop_metadata.h"
 #include "pycore_long.h"