Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-118844: Fix --disable-gil & --enable-experimental-jit fails to build #118935

Merged
merged 5 commits into from
May 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/subprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix build failures when configuring with both ``--disable-gil`` and ``--enable-experimental-jit``.
1 change: 1 addition & 0 deletions Python/jit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions Python/perf_jit_trampoline.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading