gh-111903: Update AC to support "pycore_critical_section.h" header (g…

…h-112251)
python · Nov 19, 2023 · b8c952a · b8c952a
1 parent 1a969b4
commit b8c952a
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
@@ -1,6 +1,5 @@
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
-#include "pycore_critical_section.h"  // Py_BEGIN_CRITICAL_SECTION
 #include "pycore_dict.h"          // _PyDict_Pop_KnownHash()
 #include "pycore_long.h"          // _PyLong_GetZero()
 #include "pycore_moduleobject.h"  // _PyModule_GetState()

diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
@@ -10,7 +10,6 @@
 #include "Python.h"
 #include "pycore_bytesobject.h"   // _PyBytes_Join()
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
-#include "pycore_critical_section.h"  // Py_BEGIN_CRITICAL_SECTION()
 #include "pycore_object.h"        // _PyObject_GC_UNTRACK()
 #include "pycore_pyerrors.h"      // _Py_FatalErrorFormat()
 #include "pycore_pylifecycle.h"   // _Py_IsInterpreterFinalizing()

diff --git a/Modules/_io/clinic/bufferedio.c.h b/Modules/_io/clinic/bufferedio.c.h
diff --git a/Modules/_io/clinic/textio.c.h b/Modules/_io/clinic/textio.c.h
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
@@ -9,7 +9,6 @@
 #include "Python.h"
 #include "pycore_call.h"              // _PyObject_CallMethod()
 #include "pycore_codecs.h"            // _PyCodecInfo_GetIncrementalDecoder()
-#include "pycore_critical_section.h"  // Py_BEGIN_CRITICAL_SECTION()
 #include "pycore_fileutils.h"         // _Py_GetLocaleEncoding()
 #include "pycore_interp.h"            // PyInterpreterState.fs_codec
 #include "pycore_long.h"              // _PyLong_GetZero()

diff --git a/Modules/clinic/_functoolsmodule.c.h b/Modules/clinic/_functoolsmodule.c.h
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
@@ -1111,7 +1111,8 @@ def output_templates(
             if include:
                 clinic.add_include(include.filename, include.reason,
                                    condition=include.condition)
-
+        if f.critical_section:
+            clinic.add_include('pycore_critical_section.h', 'Py_BEGIN_CRITICAL_SECTION()')
         has_option_groups = parameters and (parameters[0].group or parameters[-1].group)
         simple_return = (f.return_converter.type == 'PyObject *'
                          and not f.critical_section)