gh-85283: If Py_LIMITED_API is defined, undefine Py_BUILD_CORE

vstinner · vstinner · commit 097c71b09f71 · 2023-10-11T17:31:44.000+02:00
If the Py_LIMITED_API macro is defined, Py_BUILD_CORE,
Py_BUILD_CORE_BUILTIN and Py_BUILD_CORE_MODULE macros are now
undefined by Python.h.

Only undefine these 3 macros after including "exports.h" which uses
them to define PyAPI_FUNC(), PyAPI_DATA() and PyMODINIT_FUNC macros.

Remove hacks (undefine manually the 3 Py_BUILD_CORE macros) in
Modules/_testcapi/parts.h and Modules/_testclinic_limited.c.
diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst
@@ -1075,6 +1075,11 @@ Porting to Python 3.13
   :c:func:`!Py_TOLOWER`.
   (Contributed by Victor Stinner in :gh:`108765`.)
 
+* If the :c:macro:`Py_LIMITED_API` macro is defined, :c:macro:`Py_BUILD_CORE`,
+  :c:macro:`Py_BUILD_CORE_BUILTIN` and :c:macro:`Py_BUILD_CORE_MODULE` macros
+  are now undefined by ``<Python.h>``.
+  (Contributed by Victor Stinner in :gh:`85283`.)
+
 Deprecated
 ----------
 
diff --git a/Include/pyport.h b/Include/pyport.h
@@ -48,10 +48,6 @@
 #  define Py_BUILD_CORE
 #endif
 
-#if defined(Py_LIMITED_API) && defined(Py_BUILD_CORE)
-#  error "Py_LIMITED_API is not compatible with Py_BUILD_CORE"
-#endif
-
 
 /**************************************************************************
 Symbols and macros to supply platform-independent interfaces to basic
@@ -361,6 +357,15 @@ extern "C" {
 
 #include "exports.h"
 
+#ifdef Py_LIMITED_API
+   // The internal C API must not be used with the limited C API: make sure
+   // that Py_BUILD_CORE macro is not defined in this case. These 3 macros are
+   // used by exports.h, so only undefine them afterwards.
+#  undef Py_BUILD_CORE
+#  undef Py_BUILD_CORE_BUILTIN
+#  undef Py_BUILD_CORE_MODULE
+#endif
+
 /* limits.h constants that may be missing */
 
 #ifndef INT_MAX
diff --git a/Misc/NEWS.d/next/C API/2023-10-11-17-29-52.gh-issue-85283.OsqIBF.rst b/Misc/NEWS.d/next/C API/2023-10-11-17-29-52.gh-issue-85283.OsqIBF.rst
@@ -0,0 +1,3 @@
+If the :c:macro:`Py_LIMITED_API` macro is defined, :c:macro:`Py_BUILD_CORE`,
+:c:macro:`Py_BUILD_CORE_BUILTIN` and :c:macro:`Py_BUILD_CORE_MODULE` macros
+are now undefined by ``<Python.h>``. Patch by Victor Stinner.
diff --git a/Modules/_testcapi/parts.h b/Modules/_testcapi/parts.h
@@ -4,18 +4,6 @@
 // Always enable assertions
 #undef NDEBUG
 
-// The _testcapi extension tests the public C API: header files in Include/ and
-// Include/cpython/ directories. The internal C API must not be tested by
-// _testcapi: use _testinternalcapi for that.
-//
-// _testcapi C files can built with the Py_BUILD_CORE_BUILTIN macro defined if
-// one of the Modules/Setup files asks to build _testcapi as "static"
-// (gh-109723).
-//
-// The Visual Studio projects builds _testcapi with Py_BUILD_CORE_MODULE.
-#undef Py_BUILD_CORE_MODULE
-#undef Py_BUILD_CORE_BUILTIN
-
 #include "Python.h"
 
 #ifdef Py_BUILD_CORE
diff --git a/Modules/_testclinic_limited.c b/Modules/_testclinic_limited.c
@@ -1,9 +1,3 @@
-// _testclinic_limited can built with the Py_BUILD_CORE_BUILTIN macro defined
-// if one of the Modules/Setup files asks to build it as "static" (gh-109723).
-#undef Py_BUILD_CORE
-#undef Py_BUILD_CORE_MODULE
-#undef Py_BUILD_CORE_BUILTIN
-
 // For now, only limited C API 3.13 is supported
 #define Py_LIMITED_API 0x030d0000
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+If the :c:macro:`Py_LIMITED_API` macro is defined, :c:macro:`Py_BUILD_CORE`,
	`2`	+:c:macro:`Py_BUILD_CORE_BUILTIN` and :c:macro:`Py_BUILD_CORE_MODULE` macros
	`3`	+are now undefined by ``<Python.h>``. Patch by Victor Stinner.