Don't mess with END_FOR

python · Mar 13, 2023 · 12e85cf · 12e85cf
1 parent 68077f1
commit 12e85cf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -135,9 +135,7 @@ dummy_func(
             res = NULL;
         }
 
-        inst(END_FOR, (second, first --)) {
-            DECREF_INPUTS();
-        }
+        macro(END_FOR) = POP_TOP + POP_TOP;
 
         inst(UNARY_NEGATIVE, (value -- res)) {
             res = PyNumber_Negative(value);

diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
@@ -38,7 +38,7 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
         case PUSH_NULL:
             return 0;
         case END_FOR:
-            return 2;
+            return 1+1;
         case UNARY_NEGATIVE:
             return 1;
         case UNARY_NOT:
@@ -390,7 +390,7 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
         case PUSH_NULL:
             return 1;
         case END_FOR:
-            return 0;
+            return 0+0;
         case UNARY_NEGATIVE:
             return 1;
         case UNARY_NOT:
@@ -735,7 +735,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[256] = {
     [LOAD_CONST__LOAD_FAST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBIB },
     [POP_TOP] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX },
     [PUSH_NULL] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX },
-    [END_FOR] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX },
+    [END_FOR] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
     [UNARY_NEGATIVE] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX },
     [UNARY_NOT] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX },
     [UNARY_INVERT] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX },