GH-118844: Fix build failures when combining --disable-gil with --ena…

…ble-experimental-jit (GH-118935)
python · May 11, 2024 · 5b941e5 · 5b941e5
1 parent abead54
commit 5b941e5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
@@ -842,7 +842,7 @@ def __init__(self, args, bufsize=-1, executable=None,
             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
@@ -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
@@ -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
@@ -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;