diff options
| author | Irit Katriel <1055913+iritkatriel@users.noreply.github.com> | 2023-07-11 12:41:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-11 12:41:50 (GMT) |
| commit | 388b5daa523b828dc0f7e2a1a6886bebc20833ba (patch) | |
| tree | 1195cc2b6eda323b82c07850bdaebdd42c629422 | |
| parent | 95b7426f45edb570869a5513c142f29ed9f851a1 (diff) | |
| download | cpython-388b5daa523b828dc0f7e2a1a6886bebc20833ba.zip cpython-388b5daa523b828dc0f7e2a1a6886bebc20833ba.tar.gz cpython-388b5daa523b828dc0f7e2a1a6886bebc20833ba.tar.bz2 | |
gh-106360: remove redundant #ifdef (#106622)
| -rw-r--r-- | Python/opcode_metadata.h | 4 | ||||
| -rw-r--r-- | Tools/cases_generator/generate_cases.py | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h index ce2384e..34ac85d 100644 --- a/Python/opcode_metadata.h +++ b/Python/opcode_metadata.h @@ -960,7 +960,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 }, @@ -1293,7 +1293,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", @@ -1314,4 +1313,3 @@ const char * const _PyOpcode_uop_name[512] = { [316] = "IS_NONE", }; #endif // NEED_OPCODE_METADATA -#endif diff --git a/Tools/cases_generator/generate_cases.py b/Tools/cases_generator/generate_cases.py index 932d0c1..641a327 100644 --- a/Tools/cases_generator/generate_cases.py +++ b/Tools/cases_generator/generate_cases.py @@ -1240,7 +1240,7 @@ class Analyzer: 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 @@ class Analyzer: 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 |