GH-118844: Fix build failures when combining --disable-gil with --enable-experimental...

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 212fdf5b0955118a70bd8c088b64220a122fcd3b..b2dcb1454c139ee4f6fe5e90d769fce13a8c9578 100644 (file)
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -842,7 +842,7 @@ class Popen:
             raise TypeError("bufsize must be an integer")
 
         if stdout is STDOUT:
-             raise ValueError("STDOUT can only be used for stderr")
+            raise ValueError("STDOUT can only be used for stderr")
 
         if pipesize is None:
             pipesize = -1  # Restore default

diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-05-11-21-44-17.gh-issue-118844.q2H_km.rst b/Misc/NEWS.d/next/Core and Builtins/2024-05-11-21-44-17.gh-issue-118844.q2H_km.rst
new file mode 100644 (file)
index 0000000..6e80b77
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2024-05-11-21-44-17.gh-issue-118844.q2H_km.rst
@@ -0,0 +1 @@
+Fix build failures when configuring with both ``--disable-gil`` and ``--enable-experimental-jit``.

diff --git a/Python/jit.c b/Python/jit.c
index 7c316a410dda6a16536504dbc124882fdd8992d3..d0c0d24f4539e29ab7bb66ad634c78ae46a9bbfe 100644 (file)
--- a/Python/jit.c
+++ b/Python/jit.c
@@ -5,6 +5,7 @@
 #include "pycore_abstract.h"
 #include "pycore_call.h"
 #include "pycore_ceval.h"
+#include "pycore_critical_section.h"
 #include "pycore_dict.h"
 #include "pycore_intrinsics.h"
 #include "pycore_long.h"

diff --git a/Python/perf_jit_trampoline.c b/Python/perf_jit_trampoline.c
index 2a29318b1054a56e2ea584a59d84d6f38ab744db..0a8945958b4b3cbcdfd048e12d76f9c1e71a4172 100644 (file)
--- a/Python/perf_jit_trampoline.c
+++ b/Python/perf_jit_trampoline.c
@@ -174,8 +174,8 @@ static const uint8_t DwarfDataRel = 0x30;
 typedef struct {
     unsigned char version;
     unsigned char eh_frame_ptr_enc;
-    unsigned char      fde_count_enc;
-    unsigned char      table_enc;
+    unsigned char fde_count_enc;
+    unsigned char table_enc;
     int32_t eh_frame_ptr;
     int32_t eh_fde_count;
     int32_t from;