diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h index 64923e61fa4590..34a102c4e4e519 100644 --- a/Python/opcode_metadata.h +++ b/Python/opcode_metadata.h @@ -959,7 +959,7 @@ struct opcode_macro_expansion { extern const struct opcode_metadata _PyOpcode_opcode_metadata[512]; extern const struct opcode_macro_expansion _PyOpcode_macro_expansion[256]; extern const char * const _PyOpcode_uop_name[512]; -#else +#else // if NEED_OPCODE_METADATA const struct opcode_metadata _PyOpcode_opcode_metadata[512] = { [NOP] = { true, INSTR_FMT_IX, 0 }, [RESUME] = { true, INSTR_FMT_IB, HAS_ARG_FLAG }, @@ -1292,7 +1292,6 @@ const struct opcode_macro_expansion _PyOpcode_macro_expansion[256] = { [BINARY_OP] = { .nuops = 1, .uops = { { BINARY_OP, 0, 0 } } }, [SWAP] = { .nuops = 1, .uops = { { SWAP, 0, 0 } } }, }; -#ifdef NEED_OPCODE_METADATA const char * const _PyOpcode_uop_name[512] = { [300] = "EXIT_TRACE", [301] = "SAVE_IP", @@ -1312,4 +1311,3 @@ const char * const _PyOpcode_uop_name[512] = { [315] = "_LOAD_FROM_DICT_OR_GLOBALS", }; #endif // NEED_OPCODE_METADATA -#endif diff --git a/Tools/cases_generator/generate_cases.py b/Tools/cases_generator/generate_cases.py index 932d0c14d398ab..641a327b06aa22 100644 --- a/Tools/cases_generator/generate_cases.py +++ b/Tools/cases_generator/generate_cases.py @@ -1240,7 +1240,7 @@ def write_metadata(self) -> None: self.out.emit("extern const struct opcode_metadata _PyOpcode_opcode_metadata[512];") self.out.emit("extern const struct opcode_macro_expansion _PyOpcode_macro_expansion[256];") self.out.emit("extern const char * const _PyOpcode_uop_name[512];") - self.out.emit("#else") + self.out.emit("#else // if NEED_OPCODE_METADATA") self.out.emit("const struct opcode_metadata _PyOpcode_opcode_metadata[512] = {") @@ -1289,12 +1289,10 @@ def write_metadata(self) -> None: case _: typing.assert_never(thing) - self.out.emit("#ifdef NEED_OPCODE_METADATA") with self.out.block("const char * const _PyOpcode_uop_name[512] =", ";"): self.write_uop_items(lambda name, counter: f"[{counter}] = \"{name}\",") - self.out.emit("#endif // NEED_OPCODE_METADATA") - self.out.emit("#endif") + self.out.emit("#endif // NEED_OPCODE_METADATA") with open(self.pymetadata_filename, "w") as f: # Create formatter
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies: