DO NOT MERGE: Assert that _PyFrame_OpAlreadyRan never sees ENTER_EXECUTOR

gvanrossum · gvanrossum · commit 3c00eaeab076 · 2023-08-21T14:34:47.000-07:00
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
@@ -1110,6 +1110,7 @@ _PyFrame_OpAlreadyRan(_PyInterpreterFrame *frame, int opcode, int oparg)
          instruction < frame->prev_instr; instruction++)
     {
         int check_opcode = _PyOpcode_Deopt[instruction->op.code];
+        assert(check_opcode != ENTER_EXECUTOR);
         check_oparg |= instruction->op.arg;
         if (check_opcode == opcode && check_oparg == oparg) {
             return 1;

Original file line number	Diff line number	Diff line change
`@@ -1110,6 +1110,7 @@ _PyFrame_OpAlreadyRan(_PyInterpreterFrame *frame, int opcode, int oparg)`
`1110`	`1110`	`instruction < frame->prev_instr; instruction++)`
`1111`	`1111`	`{`
`1112`	`1112`	`int check_opcode = _PyOpcode_Deopt[instruction->op.code];`
	`1113`	`+ assert(check_opcode != ENTER_EXECUTOR);`
`1113`	`1114`	`check_oparg \|= instruction->op.arg;`
`1114`	`1115`	`if (check_opcode == opcode && check_oparg == oparg) {`
`1115`	`1116`	`return 1;`