Commit02f7a9f

committed

fix test__opcode. Special case INSTRUMENTED_LINE in generator

1 parentf7ae491 commit02f7a9fCopy full SHA for 02f7a9f

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -949,7 +949,8 @@ enum InstructionFormat { INSTR_FMT_IB, INSTR_FMT_IBC, INSTR_FMT_IBC00, INSTR_FMT`
`949`	`949`
`950`	`950`	`#defineIS_VALID_OPCODE(OP) \`
`951`	`951`	`(((OP) >= 0) && ((OP) < OPCODE_METADATA_SIZE) && \`
`952`		`- (_PyOpcode_opcode_metadata[(OP)].valid_entry))`
	`952`	`+ (_PyOpcode_opcode_metadata[(OP)].valid_entry)) \|\| \`
	`953`	`+ ((OP) == INSTRUMENTED_LINE)`
`953`	`954`
`954`	`955`	`#defineHAS_ARG_FLAG (1)`
`955`	`956`	`#defineHAS_CONST_FLAG (2)`
`@@ -964,7 +965,7 @@ enum InstructionFormat { INSTR_FMT_IB, INSTR_FMT_IBC, INSTR_FMT_IBC00, INSTR_FMT`
`964`	`965`	`#defineOPCODE_HAS_JUMP(OP) (_PyOpcode_opcode_metadata[OP].flags & (HAS_JUMP_FLAG))`
`965`	`966`	`#defineOPCODE_HAS_FREE(OP) (_PyOpcode_opcode_metadata[OP].flags & (HAS_FREE_FLAG))`
`966`	`967`	`#defineOPCODE_HAS_LOCAL(OP) (_PyOpcode_opcode_metadata[OP].flags & (HAS_LOCAL_FLAG))`
`967`		`-#defineOPCODE_IS_INSTRUMENTED(OP) (_PyOpcode_opcode_metadata[OP].flags & (IS_INSTRUMENTED_FLAG))`
	`968`	`+#defineOPCODE_IS_INSTRUMENTED(OP) (_PyOpcode_opcode_metadata[OP].flags & (IS_INSTRUMENTED_FLAG)) \|\| ((OP) == INSTRUMENTED_LINE)`
`968`	`969`
`969`	`970`	`structopcode_metadata {`
`970`	`971`	`boolvalid_entry;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ def test_stack_effect(self):`
`58`	`58`	`# All defined opcodes`
`59`	`59`	`has_arg=dis.hasarg`
`60`	`60`	`forname,codeinfilter(lambdaitem:item[0]notindis.deoptmap,dis.opmap.items()):`
`61`		`-ifcode>=opcode.MIN_INSTRUMENTED_OPCODE:`
	`61`	`+if_opcode.is_instrumented(code):`
`62`	`62`	`continue`
`63`	`63`	`withself.subTest(opname=name):`
`64`	`64`	`stack_effect(code)`
`@@ -83,7 +83,7 @@ def test_stack_effect_jump(self):`
`83`	`83`	`has_exc=dis.hasexc`
`84`	`84`	`has_jump=dis.hasjabs+dis.hasjrel`
`85`	`85`	`forname,codeinfilter(lambdaitem:item[0]notindis.deoptmap,dis.opmap.items()):`
`86`		`-ifcode>=opcode.MIN_INSTRUMENTED_OPCODE:`
	`86`	`+if_opcode.is_instrumented(code):`
`87`	`87`	`continue`
`88`	`88`	`withself.subTest(opname=name):`
`89`	`89`	`ifcodenotinhas_arg:`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,13 @@ def emit_macros(cls, out: Formatter):`
`70`	`70`	`out.emit(f"#define{name} ({value})")`
`71`	`71`
`72`	`72`	`forname,valueinflags.bitmask.items():`
	`73`	`+ifname=='IS_INSTRUMENTED_FLAG':`
	`74`	`+or_special_case=" \|\| ((OP) == INSTRUMENTED_LINE)"`
	`75`	`+else:`
	`76`	`+or_special_case=""`
`73`	`77`	`out.emit(`
`74`	`78`	`f"#define OPCODE_{name[:-len('_FLAG')]}(OP) "`
`75`		`-f"(_PyOpcode_opcode_metadata[OP].flags & ({name}))"`
	`79`	`+f"(_PyOpcode_opcode_metadata[OP].flags & ({name})){or_special_case}"`
`76`	`80`	`)`
`77`	`81`
`78`	`82`

Lines changed: 2 additions & 1 deletion

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("")`

Comments

(0)