Just use _Py_atomic_exchange_ptr instead of FT macro

DinoV · DinoV · commit 90192e682ed7 · 2024-04-04T15:51:50.000-07:00
diff --git a/Include/internal/pycore_pyatomic_ft_wrappers.h b/Include/internal/pycore_pyatomic_ft_wrappers.h
@@ -37,8 +37,6 @@ extern "C" {
     _Py_atomic_store_ssize_relaxed(&value, new_value)
 #define FT_ATOMIC_STORE_UINT8_RELAXED(value, new_value) \
     _Py_atomic_store_uint8_relaxed(&value, new_value)
-#define FT_ATOMIC_EXCHANGE_PYOBJECT(value, new_value)   \
-    _Py_atomic_exchange_ptr(&value, new_value)
 
 #else
 #define FT_ATOMIC_LOAD_SSIZE(value) value
@@ -50,16 +48,6 @@ extern "C" {
 #define FT_ATOMIC_STORE_UINTPTR_RELEASE(value, new_value) value = new_value
 #define FT_ATOMIC_STORE_SSIZE_RELAXED(value, new_value) value = new_value
 #define FT_ATOMIC_STORE_UINT8_RELAXED(value, new_value) value = new_value
-#define FT_ATOMIC_EXCHANGE_PYOBJECT(value, new_value)   \
-    _atomic_exchange_pyobject_withgil(&value, new_value)
-
-static inline PyObject *
-_atomic_exchange_pyobject_withgil(PyObject **src, PyObject *new_value)
-{
-    PyObject *res = *src;
-    *src = new_value;
-    return res;
-}
 
 #endif
 
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
@@ -1374,9 +1374,8 @@ _PyMonitoring_RegisterCallback(int tool_id, int event_id, PyObject *obj)
     PyInterpreterState *is = _PyInterpreterState_GET();
     assert(0 <= tool_id && tool_id < PY_MONITORING_TOOL_IDS);
     assert(0 <= event_id && event_id < _PY_MONITORING_EVENTS);
-    PyObject *callback = FT_ATOMIC_EXCHANGE_PYOBJECT(is->monitoring_callables[tool_id][event_id],
-        Py_XNewRef(obj)
-    );
+    PyObject *callback = _Py_atomic_exchange_ptr(&is->monitoring_callables[tool_id][event_id],
+                                                 Py_XNewRef(obj));
 
     return callback;
 }
