pythongh-106320: Remove _Py_SwappedOp from the C API (python#107036)

vstinner · mementum · commit 298bb8d4e75a · 2023-07-24T01:48:17.000+02:00
Move _Py_SwappedOp to the internal C API (pycore_object.h).
diff --git a/Include/cpython/object.h b/Include/cpython/object.h
@@ -377,11 +377,6 @@ PyAPI_FUNC(PyObject *) _PyObject_FunctionStr(PyObject *);
 #endif
 
 
-/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE.
- * Defined in object.c.
- */
-PyAPI_DATA(int) _Py_SwappedOp[];
-
 PyAPI_FUNC(void)
 _PyDebugAllocatorStats(FILE *out, const char *block_name, int num_blocks,
                        size_t sizeof_block);
diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
@@ -442,6 +442,9 @@ extern PyObject* _PyCFunctionWithKeywords_TrampolineCall(
 PyAPI_DATA(PyTypeObject) _PyNone_Type;
 PyAPI_DATA(PyTypeObject) _PyNotImplemented_Type;
 
+/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE.  Defined in Objects/object.c. */
+PyAPI_DATA(int) _Py_SwappedOp[];
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Objects/object.c b/Objects/object.c
@@ -9,7 +9,7 @@
 #include "pycore_floatobject.h"   // _PyFloat_DebugMallocStats()
 #include "pycore_initconfig.h"    // _PyStatus_EXCEPTION()
 #include "pycore_namespace.h"     // _PyNamespace_Type
-#include "pycore_object.h"        // _PyType_CheckConsistency(), _Py_FatalRefcountError()
+#include "pycore_object.h"        // PyAPI_DATA() _Py_SwappedOp definition
 #include "pycore_pyerrors.h"      // _PyErr_Occurred()
 #include "pycore_pymem.h"         // _PyMem_IsPtrFreed()
 #include "pycore_pystate.h"       // _PyThreadState_GET()

Original file line number	Diff line number	Diff line change
`@@ -442,6 +442,9 @@ extern PyObject* _PyCFunctionWithKeywords_TrampolineCall(`
`442`	`442`	`PyAPI_DATA(PyTypeObject) _PyNone_Type;`
`443`	`443`	`PyAPI_DATA(PyTypeObject) _PyNotImplemented_Type;`
`444`	`444`
	`445`	`+/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE. Defined in Objects/object.c. */`
	`446`	`+PyAPI_DATA(int) _Py_SwappedOp[];`
	`447`	`+`
`445`	`448`	`#ifdef __cplusplus`
`446`	`449`	`}`
`447`	`450`	`#endif`