fix test__opcode. Special case INSTRUMENTED_LINE in generator

iritkatriel · iritkatriel · commit 91ef606121f8 · 2023-07-26T12:24:38.000+01:00
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
@@ -949,7 +949,8 @@ enum InstructionFormat { INSTR_FMT_IB, INSTR_FMT_IBC, INSTR_FMT_IBC00, INSTR_FMT
 
 #define IS_VALID_OPCODE(OP) \
     (((OP) >= 0) && ((OP) < OPCODE_METADATA_SIZE) && \
-     (_PyOpcode_opcode_metadata[(OP)].valid_entry))
+     (_PyOpcode_opcode_metadata[(OP)].valid_entry)) || \
+     ((OP) == INSTRUMENTED_LINE)
 
 #define HAS_ARG_FLAG (1)
 #define HAS_CONST_FLAG (2)
@@ -964,7 +965,7 @@ enum InstructionFormat { INSTR_FMT_IB, INSTR_FMT_IBC, INSTR_FMT_IBC00, INSTR_FMT
 #define OPCODE_HAS_JUMP(OP) (_PyOpcode_opcode_metadata[OP].flags & (HAS_JUMP_FLAG))
 #define OPCODE_HAS_FREE(OP) (_PyOpcode_opcode_metadata[OP].flags & (HAS_FREE_FLAG))
 #define OPCODE_HAS_LOCAL(OP) (_PyOpcode_opcode_metadata[OP].flags & (HAS_LOCAL_FLAG))
-#define OPCODE_IS_INSTRUMENTED(OP) (_PyOpcode_opcode_metadata[OP].flags & (IS_INSTRUMENTED_FLAG))
+#define OPCODE_IS_INSTRUMENTED(OP) (_PyOpcode_opcode_metadata[OP].flags & (IS_INSTRUMENTED_FLAG)) || ((OP) == INSTRUMENTED_LINE)
 
 struct opcode_metadata {
     bool valid_entry;
diff --git a/Lib/test/test__opcode.py b/Lib/test/test__opcode.py
@@ -58,10 +58,14 @@ def test_stack_effect(self):
         # All defined opcodes
         has_arg = dis.hasarg
         for name, code in filter(lambda item: item[0] not in dis.deoptmap, dis.opmap.items()):
-            if code >= opcode.MIN_INSTRUMENTED_OPCODE:
+            if _opcode.is_instrumented(code):
                 continue
             with self.subTest(opname=name):
-                stack_effect(code)
+                try:
+                  stack_effect(code)
+                except Exception as e:
+                  breakpoint()
+                  raise
                 stack_effect(code, 0)
         # All not defined opcodes
         for code in set(range(256)) - set(dis.opmap.values()):
@@ -83,7 +87,7 @@ def test_stack_effect_jump(self):
         has_exc = dis.hasexc
         has_jump = dis.hasjabs + dis.hasjrel
         for name, code in filter(lambda item: item[0] not in dis.deoptmap, dis.opmap.items()):
-            if code >= opcode.MIN_INSTRUMENTED_OPCODE:
+            if _opcode.is_instrumented(code):
                 continue
             with self.subTest(opname=name):
                 if code not in has_arg:
diff --git a/Tools/cases_generator/flags.py b/Tools/cases_generator/flags.py
@@ -70,9 +70,13 @@ def emit_macros(cls, out: Formatter):
             out.emit(f"#define {name} ({value})")
 
         for name, value in flags.bitmask.items():
+            if name == 'IS_INSTRUMENTED_FLAG':
+                or_special_case = " || ((OP) == INSTRUMENTED_LINE)"
+            else:
+                or_special_case = ""
             out.emit(
                 f"#define OPCODE_{name[:-len('_FLAG')]}(OP) "
-                f"(_PyOpcode_opcode_metadata[OP].flags & ({name}))"
+                f"(_PyOpcode_opcode_metadata[OP].flags & ({name})){or_special_case}"
             )
 
 
diff --git a/Tools/cases_generator/generate_cases.py b/Tools/cases_generator/generate_cases.py
@@ -283,7 +283,8 @@ def write_metadata(self, metadata_filename: str, pymetadata_filename: str) -> No
             self.out.emit(
                 "#define IS_VALID_OPCODE(OP) \\\n"
                 "    (((OP) >= 0) && ((OP) < OPCODE_METADATA_SIZE) && \\\n"
-                "     (_PyOpcode_opcode_metadata[(OP)].valid_entry))"
+                "     (_PyOpcode_opcode_metadata[(OP)].valid_entry)) || \\\n"
+                "     ((OP) == INSTRUMENTED_LINE)"   # implemented in ceval.c, not bytecodes.c
             )
 
             self.out.emit("")

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,8 @@ def write_metadata(self, metadata_filename: str, pymetadata_filename: str) -> No`
`283`	`283`	`self.out.emit(`
`284`	`284`	`"#define IS_VALID_OPCODE(OP) \\\n"`
`285`	`285`	`" (((OP) >= 0) && ((OP) < OPCODE_METADATA_SIZE) && \\\n"`
`286`		`- " (_PyOpcode_opcode_metadata[(OP)].valid_entry))"`
	`286`	`+ " (_PyOpcode_opcode_metadata[(OP)].valid_entry)) \|\| \\\n"`
	`287`	`+ " ((OP) == INSTRUMENTED_LINE)" # implemented in ceval.c, not bytecodes.c`
`287`	`288`	`)`
`288`	`289`
`289`	`290`	`self.out.emit("")`