Move stuff around to suit the JIT branch

gvanrossum · Nov 16, 2023 · def1830 · def1830
1 parent 36e9ada
commit def1830
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -2550,13 +2550,10 @@ dummy_func(
                 Py_DECREF(iter);
                 STACK_SHRINK(1);
                 /* HACK: Emulate DEOPT_IF to jump over END_FOR */
-                _PyFrame_SetStackPointer(frame, stack_pointer);
                 frame->instr_ptr += 1 + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
                 assert(frame->instr_ptr[-1].op.code == END_FOR ||
                        frame->instr_ptr[-1].op.code == INSTRUMENTED_END_FOR);
-                Py_DECREF(current_executor);
-                OPT_HIST(trace_uop_execution_counter, trace_run_length_hist);
-                goto enter_tier_one;
+                goto exit_trace;
             }
             // Common case: no jump, leave it to the code generator
         }
@@ -4034,6 +4031,7 @@ dummy_func(
 
         op(_EXIT_TRACE, (--)) {
             TIER_TWO_ONLY
+            frame->instr_ptr = CURRENT_TARGET() + _PyCode_CODE(_PyFrame_GetCode(frame));
             GOTO_TIER_ONE();
         }
 

diff --git a/Python/ceval.c b/Python/ceval.c
@@ -1067,7 +1067,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
     UOP_STAT_INC(opcode, miss);
     frame->return_offset = 0;  // Dispatch to frame->instr_ptr
     _PyFrame_SetStackPointer(frame, stack_pointer);
-    frame->instr_ptr = next_uop[-1].target + _PyCode_CODE((PyCodeObject *)frame->f_executable);
+    frame->instr_ptr = next_uop[-1].target + _PyCode_CODE(_PyFrame_GetCode(frame));
     Py_DECREF(current_executor);
     // Fall through
 // Jump here from ENTER_EXECUTOR
@@ -1078,7 +1078,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
 // Jump here from _EXIT_TRACE
 exit_trace:
     _PyFrame_SetStackPointer(frame, stack_pointer);
-    frame->instr_ptr = next_uop[-1].target + _PyCode_CODE((PyCodeObject *)frame->f_executable);
     Py_DECREF(current_executor);
     OPT_HIST(trace_uop_execution_counter, trace_run_length_hist);
     goto enter_tier_one;

diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
@@ -397,3 +397,5 @@ stack_pointer = _PyFrame_GetStackPointer(frame);
 #define GOTO_TIER_TWO() goto enter_tier_two;
 
 #define GOTO_TIER_ONE() goto exit_trace;
+
+#define CURRENT_TARGET() (next_uop[-1].target)
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -397,3 +397,5 @@ stack_pointer = _PyFrame_GetStackPointer(frame);
		#define GOTO_TIER_TWO() goto enter_tier_two;

		#define GOTO_TIER_ONE() goto exit_trace;

		#define CURRENT_TARGET() (next_uop[-1].target)