Skip to content

gh-125207: Fix MSVC 1935 build with JIT #125209

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Oct 18, 2024
Merged

gh-125207: Fix MSVC 1935 build with JIT #125209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51618b6
gh-125207: Use {0} array initializers
mdboom Oct 9, 2024
383f97a
Merge remote-tracking branch 'upstream/main' into jit-stencil-initial…
mdboom Oct 18, 2024
8e47990
Simplify, as suggested in PR
mdboom Oct 18, 2024
6ffc678
Revert change to explicitly specify length
mdboom Oct 18, 2024
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 Python/jit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ _PyJIT_Compile(_PyExecutorObject *executor, const _PyUOpInstruction trace[], siz
// Loop once to find the total compiled size:
size_t code_size = 0;
size_t data_size = 0;
jit_state state = {};
jit_state state = {0};
group = &trampoline;
code_size += group->code_size;
data_size += group->data_size;
Expand Down
2 changes: 1 addition & 1 deletion Tools/jit/_stencils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def _get_trampoline_mask(self) -> str:
word = bitmask & ((1 << 32) - 1)
trampoline_mask.append(f"{word:#04x}")
bitmask >>= 32
return "{" + ", ".join(trampoline_mask) + "}"
return "{" + (", ".join(trampoline_mask) or "0") + "}"

def as_c(self, opname: str) -> str:
"""Dump this hole as a StencilGroup initializer."""
Expand Down
7 changes: 5 additions & 2 deletions Tools/jit/_writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,11 @@ def _dump_footer(
yield "};"
yield ""
yield f"static const void * const symbols_map[{max(len(symbols), 1)}] = {{"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at this, there shouldn't be a need for the length in here? And while I believe it's okay, it could be affected by this change.

for symbol, ordinal in symbols.items():
yield f" [{ordinal}] = &{symbol},"
if symbols:
for symbol, ordinal in symbols.items():
yield f" [{ordinal}] = &{symbol},"
else:
yield " 0"
yield "};"


Expand Down
Loading