From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 13 May 2024 04:53:30 +0000 (+0200)
Subject: [3.13] GH-118844: Fix build failures when combining --disable-gil with --enable-exper... 
X-Git-Tag: v3.13.0b2~226
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d2c10bee3d8c756d395b840192dc3efd6ba8134;p=thirdparty%2FPython%2Fcpython.git

[3.13] GH-118844: Fix build failures when combining --disable-gil with --enable-experimental-jit (GH-118959)

(cherry picked from commit 5b941e57c71d7d0ab983d81a169f892662cfe446)

Co-authored-by: Savannah Ostrowski <savannahostrowski@gmail.com>
---

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 212fdf5b0955..b2dcb1454c13 100644
--- 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
index 000000000000..6e80b7738894
--- /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 7c316a410dda..d0c0d24f4539 100644
--- 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 2a29318b1054..0a8945958b4b 100644
--- 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;