Hacky way to make _FOR_ITER a viable uop

gvanrossum · Nov 15, 2023 · e909a83 · e909a83
1 parent f965c81
commit e909a83
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 2 deletions.
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Python/abstract_interp_cases.c.h b/Python/abstract_interp_cases.c.h
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -2368,7 +2368,7 @@ dummy_func(
             goto enter_tier_one;
         }
 
-       replaced op(_POP_JUMP_IF_FALSE, (unused/1, cond -- )) {
+        replaced op(_POP_JUMP_IF_FALSE, (unused/1, cond -- )) {
             assert(PyBool_Check(cond));
             int flag = Py_IsFalse(cond);
             #if ENABLE_SPECIALIZATION
@@ -2520,10 +2520,13 @@ dummy_func(
                     if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
                         GOTO_ERROR(error);
                     }
+                    #if TIER_ONE
                     monitor_raise(tstate, frame, this_instr);
+                    #endif
                     _PyErr_Clear(tstate);
                 }
                 /* iterator ended normally */
+                #if TIER_ONE
                 assert(next_instr[oparg].op.code == END_FOR ||
                        next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
                 Py_DECREF(iter);
@@ -2532,6 +2535,7 @@ dummy_func(
                 JUMPBY(oparg + 1);
                 DISPATCH();
 <<<<<<< HEAD
+<<<<<<< HEAD
 ||||||| parent of 7dc8c93549a (Tiny fixes to code generator)
                 #endif
                 #if TIER_TWO
@@ -2565,6 +2569,14 @@ dummy_func(
                 OPT_HIST(trace_uop_execution_counter, trace_run_length_hist);
                 goto enter_tier_one;
 >>>>>>> 7dc8c93549a (Tiny fixes to code generator)
+||||||| parent of 2bd857acb57 (Hacky way to make _FOR_ITER a viable uop)
+=======
+                #endif
+                #if TIER_TWO
+                frame->instr_ptr = _PyCode_CODE(_PyFrame_GetCode(frame)) + oparg;
+                DEOPT_IF(true);
+                #endif
+>>>>>>> 2bd857acb57 (Hacky way to make _FOR_ITER a viable uop)
             }
             // Common case: no jump, leave it to the code generator
         }

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h