Fix pegen build and suppress MSVC warning in our headers

zooba · zooba · commit 7a8d6ab08793 · 2025-05-17T17:38:38.000+01:00
diff --git a/Include/Python.h b/Include/Python.h
@@ -59,6 +59,14 @@
 #  include <intrin.h>             // __readgsqword()
 #endif
 
+// Suppress known warnings in Python header files.
+#if defined(_MSC_VER)
+// Warning that alignas behaviour has changed. Doesn't affect us, because we
+// never relied on the old behaviour.
+#pragma warning(push)
+#pragma warning(disable: 5274)
+#endif
+
 // Include Python header files
 #include "pyport.h"
 #include "pymacro.h"
@@ -138,4 +146,9 @@
 #include "cpython/pyfpe.h"
 #include "cpython/tracemalloc.h"
 
+// Restore warning filter
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif /* !Py_PYTHON_H */
diff --git a/Tools/peg_generator/pegen/build.py b/Tools/peg_generator/pegen/build.py
@@ -108,6 +108,8 @@ def compile_c_extension(
     extra_compile_args.append("-DPy_BUILD_CORE_MODULE")
     # Define _Py_TEST_PEGEN to not call PyAST_Validate() in Parser/pegen.c
     extra_compile_args.append("-D_Py_TEST_PEGEN")
+    if sys.platform == "win32" and sysconfig.get_config_var("Py_GIL_DISABLED"):
+        extra_compile_args.append("-DPy_GIL_DISABLED")
     extra_link_args = get_extra_flags("LDFLAGS", "PY_LDFLAGS_NODIST")
     if keep_asserts:
         extra_compile_args.append("-UNDEBUG")
