bpo-40268: Remove unused pycore_pymem.h includes (GH-19531)

vstinner · web-flow · commit d9ea5cae1d07 · 2020-04-15T02:57:50.000+02:00
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
@@ -1,5 +1,4 @@
 #include "Python.h"
-#include "pycore_pymem.h"
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "pycore_tupleobject.h"
 #include "structmember.h"         // PyMemberDef
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
@@ -30,7 +30,6 @@
 #include "pycore_object.h"
 #include "pycore_pyerrors.h"
 #include "pycore_pystate.h"     // _PyThreadState_GET()
-#include "pycore_pymem.h"
 #include "frameobject.h"        // PyFrame_ClearFreeList
 #include "pydtrace.h"
 #include "pytime.h"             // _PyTime_GetMonotonicClock()
diff --git a/Modules/main.c b/Modules/main.c
@@ -5,7 +5,6 @@
 #include "pycore_interp.h"       // _PyInterpreterState.sysdict
 #include "pycore_pathconfig.h"
 #include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
 #include "pycore_pystate.h"      // _PyInterpreterState_GET()
 
 /* Includes for exit_sigint() */
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
@@ -5,7 +5,6 @@
 #include "pycore_abstract.h"      // _PyIndex_Check()
 #include "pycore_bytes_methods.h"
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 #include "bytesobject.h"
 #include "pystrhex.h"
 
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -3,10 +3,10 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
-#include "pycore_abstract.h"   // _PyIndex_Check()
+#include "pycore_abstract.h"      // _PyIndex_Check()
 #include "pycore_bytes_methods.h"
 #include "pycore_object.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h"         // PYMEM_CLEANBYTE
 
 #include "pystrhex.h"
 #include <stddef.h>
diff --git a/Objects/cellobject.c b/Objects/cellobject.c
@@ -2,7 +2,6 @@
 
 #include "Python.h"
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 
 PyObject *
 PyCell_New(PyObject *obj)
diff --git a/Objects/classobject.c b/Objects/classobject.c
@@ -3,7 +3,6 @@
 #include "Python.h"
 #include "pycore_object.h"
 #include "pycore_pyerrors.h"
-#include "pycore_pymem.h"
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "structmember.h"         // PyMemberDef
 
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
@@ -8,7 +8,6 @@
 #include <Python.h>
 #include "pycore_initconfig.h"
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 #include "structmember.h"         // PyMemberDef
 #include "osdefs.h"
 
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
@@ -3,7 +3,6 @@
 
 #include "Python.h"
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 #include "pycore_tupleobject.h"
 #include "code.h"
 #include "structmember.h"         // PyMemberDef
diff --git a/Objects/iterobject.c b/Objects/iterobject.c
@@ -2,7 +2,6 @@
 
 #include "Python.h"
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 
 typedef struct {
     PyObject_HEAD
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
@@ -13,7 +13,6 @@
 #include "Python.h"
 #include "pycore_abstract.h"   // _PyIndex_Check()
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 #include "pystrhex.h"
 #include <stddef.h>
 
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
@@ -5,7 +5,6 @@
 #include "pycore_ceval.h"         // _Py_EnterRecursiveCall()
 #include "pycore_object.h"
 #include "pycore_pyerrors.h"
-#include "pycore_pymem.h"
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "structmember.h"         // PyMemberDef
 
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
@@ -1,5 +1,5 @@
 #include "Python.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h"         // _PyTraceMalloc_Config
 
 #include <stdbool.h>
 
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
@@ -16,7 +16,6 @@ this type and there is exactly one in existence.
 #include "Python.h"
 #include "pycore_abstract.h"      // _PyIndex_Check()
 #include "pycore_object.h"
-#include "pycore_pymem.h"
 #include "structmember.h"         // PyMemberDef
 
 static PyObject *
diff --git a/Python/import.c b/Python/import.c
@@ -8,7 +8,7 @@
 #include "pycore_pyerrors.h"
 #include "pycore_pyhash.h"
 #include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h"         // _PyMem_SetDefaultAllocator()
 #include "pycore_interp.h"        // _PyInterpreterState_ClearModules()
 #include "pycore_pystate.h"       // _PyInterpreterState_GET()
 #include "pycore_sysmodule.h"
diff --git a/Python/initconfig.c b/Python/initconfig.c
@@ -7,7 +7,7 @@
 #include "pycore_pathconfig.h"
 #include "pycore_pyerrors.h"
 #include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h"         // _PyMem_SetDefaultAllocator()
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include <locale.h>               // setlocale()
 #ifdef HAVE_LANGINFO_H
diff --git a/Python/pathconfig.c b/Python/pathconfig.c
@@ -5,7 +5,7 @@
 #include "pycore_initconfig.h"
 #include "pycore_fileutils.h"
 #include "pycore_pathconfig.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h"         // _PyMem_SetDefaultAllocator()
 #include <wchar.h>
 #ifdef MS_WINDOWS
 #  include <windows.h>            // GetFullPathNameW(), MAX_PATH
diff --git a/Python/preconfig.c b/Python/preconfig.c
@@ -1,9 +1,9 @@
 #include "Python.h"
 #include "pycore_getopt.h"
 #include "pycore_initconfig.h"
-#include "pycore_pymem.h"      // _PyMem_GetAllocatorName()
-#include "pycore_runtime.h"    // _PyRuntime_Initialize()
-#include <locale.h>            // setlocale()
+#include "pycore_pymem.h"         // _PyMem_GetAllocatorName()
+#include "pycore_runtime.h"       // _PyRuntime_Initialize()
+#include <locale.h>               // setlocale()
 
 
 #define DECODE_LOCALE_ERR(NAME, LEN) \
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -14,7 +14,6 @@
 #include "pycore_pathconfig.h"
 #include "pycore_pyerrors.h"
 #include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "pycore_sysmodule.h"
 #include "pycore_traceback.h"
diff --git a/Python/pystate.c b/Python/pystate.c
@@ -6,7 +6,7 @@
 #include "pycore_initconfig.h"
 #include "pycore_pyerrors.h"
 #include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
+#include "pycore_pymem.h"         // _PyMem_SetDefaultAllocator()
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "pycore_sysmodule.h"
 
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -17,14 +17,14 @@ Data members:
 #include "Python.h"
 #include "code.h"
 #include "frameobject.h"
-#include "pycore_ceval.h"        // _Py_RecursionLimitLowerWaterMark()
+#include "pycore_ceval.h"         // _Py_RecursionLimitLowerWaterMark()
 #include "pycore_initconfig.h"
 #include "pycore_object.h"
 #include "pycore_pathconfig.h"
 #include "pycore_pyerrors.h"
 #include "pycore_pylifecycle.h"
-#include "pycore_pymem.h"
-#include "pycore_pystate.h"      // _PyThreadState_GET()
+#include "pycore_pymem.h"         // _PyMem_SetDefaultAllocator()
+#include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "pycore_tupleobject.h"
 #include "pydtrace.h"
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "Python.h"`
`2`		`-#include "pycore_pymem.h"`
`3`	`2`	`#include "pycore_pystate.h" // _PyThreadState_GET()`
`4`	`3`	`#include "pycore_tupleobject.h"`
`5`	`4`	`#include "structmember.h" // PyMemberDef`