Skip to content

Commit

Permalink
gh-125207: Fix MSVC 1935 build with JIT (#125209)
Browse files Browse the repository at this point in the history
* gh-125207: Use {0} array initializers

* Simplify, as suggested in PR

* Revert change to explicitly specify length
  • Loading branch information
mdboom authored Oct 18, 2024
1 parent f8ba9fb commit c8fd4b1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Python/jit.c
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
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
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)}] = {{"
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

0 comments on commit c8fd4b1

Please sign in to comment.