python · shihai1991 · Feb 28, 2021
diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
@@ -957,6 +957,10 @@ Porting to Python 3.10
   been included directly, consider including ``Python.h`` instead.
   (Contributed by Nicholas Sim in :issue:`35134`)
 
+* The non-limited API file ``pyarena.h`` has been moved to the
+  ``Include/internal/pycore_arena.h``.
+  (Contributed by Hai Shi in :issue:`43244`.)
+
 Deprecated
 ----------
 

diff --git a/Include/Python-ast.h b/Include/Python-ast.h
diff --git a/Include/Python.h b/Include/Python.h
@@ -137,7 +137,6 @@
 #include "pystate.h"
 #include "context.h"
 
-#include "cpython/pyarena.h"
 #include "modsupport.h"
 #include "compile.h"
 #include "pythonrun.h"

diff --git a/Include/compile.h b/Include/compile.h
@@ -7,6 +7,8 @@
 extern "C" {
 #endif
 
+#include "internal/pycore_arena.h"        // struct PyArena
+
 /* Public interface */
 #define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \
                    CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \

diff --git a/Include/cpython/pyarena.h → Include/internal/pycore_arena.h b/Include/cpython/pyarena.h → Include/internal/pycore_arena.h
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -1114,7 +1114,6 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/cpython/objimpl.h \
 		$(srcdir)/Include/cpython/odictobject.h \
 		$(srcdir)/Include/cpython/picklebufobject.h \
-		$(srcdir)/Include/cpython/pyarena.h \
 		$(srcdir)/Include/cpython/pyctype.h \
 		$(srcdir)/Include/cpython/pydebug.h \
 		$(srcdir)/Include/cpython/pyerrors.h \
@@ -1129,6 +1128,7 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/cpython/tupleobject.h \
 		$(srcdir)/Include/cpython/unicodeobject.h \
 		\
+		$(srcdir)/Include/internal/pycore_arena.h \
 		$(srcdir)/Include/internal/pycore_abstract.h \
 		$(srcdir)/Include/internal/pycore_accu.h \
 		$(srcdir)/Include/internal/pycore_atomic.h \

diff --git a/Misc/NEWS.d/next/C API/2021-03-02-01-31-58.bpo-43244.SuTGYi.rst b/Misc/NEWS.d/next/C API/2021-03-02-01-31-58.bpo-43244.SuTGYi.rst
@@ -0,0 +1,2 @@
+The non-limited API file ``pyarena.h`` has been moved to the
+``Include/internal/pycore_arena.h``.
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
@@ -145,7 +145,6 @@
     <ClInclude Include="..\Include\cpython\odictobject.h" />
     <ClInclude Include="..\Include\cpython\parser_interface.h" />
     <ClInclude Include="..\Include\cpython\picklebufobject.h" />
-    <ClInclude Include="..\Include\cpython\pyarena.h" />
     <ClInclude Include="..\Include\cpython\pyctype.h" />
     <ClInclude Include="..\Include\cpython\pydebug.h" />
     <ClInclude Include="..\Include\cpython\pyerrors.h" />
@@ -173,6 +172,7 @@
     <ClInclude Include="..\Include\funcobject.h" />
     <ClInclude Include="..\Include\genobject.h" />
     <ClInclude Include="..\Include\import.h" />
+    <ClInclude Include="..\Include\internal\pycore_arena.h" />
     <ClInclude Include="..\Include\internal\pycore_abstract.h" />
     <ClInclude Include="..\Include\internal\pycore_accu.h" />
     <ClInclude Include="..\Include\internal\pycore_atomic.h" />

diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
@@ -429,9 +429,6 @@
     <ClInclude Include="..\Include\cpython\picklebufobject.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\cpython\pyarena.h">
-      <Filter>Include</Filter>
-    </ClInclude>
     <ClInclude Include="..\Include\cpython\pyctype.h">
       <Filter>Include</Filter>
     </ClInclude>
@@ -477,6 +474,9 @@
     <ClInclude Include="..\Include\cpython\initconfig.h">
       <Filter>Include\cpython</Filter>
     </ClInclude>
+    <ClInclude Include="..\Include\internal\pycore_arena.h">
+      <Filter>Include\internal</Filter>
+    </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_warnings.h">
       <Filter>Include\internal</Filter>
     </ClInclude>

diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
@@ -1499,6 +1499,7 @@ def write_header(mod, f):
     f.write('\n')
     f.write('#ifndef Py_LIMITED_API\n')
     f.write('#include "asdl.h"\n')
+    f.write('#include "pycore_arena.h"\n')
     f.write('\n')
     f.write('#undef Yield   /* undefine macro conflicting with <winbase.h> */\n')
     f.write('\n')
@@ -1549,6 +1550,8 @@ def write_source(mod, f, internal_h_file):
         #include <stddef.h>
 
         #include "Python.h"
+
+        #include "pycore_arena.h"
     """), file=f)
 
     generate_module_def(mod, f, internal_h_file)

diff --git a/Python/Python-ast.c b/Python/Python-ast.c
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -4,6 +4,7 @@
 #include <ctype.h>
 #include "ast.h"
 #undef Yield   /* undefine macro conflicting with <winbase.h> */
+#include "pycore_arena.h"         // struct PyArena
 #include "pycore_object.h"        // _Py_AddToAllObjects()
 #include "pycore_pyerrors.h"      // _PyErr_NoMemory()
 #include "pycore_pystate.h"       // _PyThreadState_GET()

diff --git a/Python/compile.c b/Python/compile.c
@@ -22,6 +22,7 @@
  */
 
 #include "Python.h"
+#include "pycore_arena.h"         // struct PyArena
 #include "pycore_pymem.h"         // _PyMem_IsPtrFreed()
 #include "pycore_long.h"          // _PyLong_GetZero()
 

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -13,6 +13,7 @@
 #include "Python-ast.h"
 #undef Yield   /* undefine macro conflicting with <winbase.h> */
 
+#include "pycore_arena.h"         // struct PyArena
 #include "pycore_interp.h"        // PyInterpreterState.importlib
 #include "pycore_object.h"        // _PyDebug_PrintTotalRefs()
 #include "pycore_pyerrors.h"      // _PyErr_Fetch

diff --git a/Tools/peg_generator/peg_extension/peg_extension.c b/Tools/peg_generator/peg_extension/peg_extension.c
@@ -1,4 +1,5 @@
 #include "pegen.h"
+#include "pycore_arena.h"        //struct PyArena
 
 PyObject *
 _build_return_object(mod_ty module, int mode, PyObject *filename_ob, PyArena *arena)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		The non-limited API file ``pyarena.h`` has been moved to the
		``Include/internal/pycore_arena.h``.