apply next_instr_offset on return/yield

python · iritkatriel · Oct 26, 2023 · Aug 29, 2023 · Aug 30, 2023 · Aug 30, 2023
commit 0089b30a332fbf1c126843dbe9daa1bfd0e38c96
@@ -791,6 +791,7 @@ dummy_func(
             _PyInterpreterFrame *dying = frame;
             frame = tstate->current_frame = dying->previous;
             _PyEval_FrameClearAndPop(tstate, dying);
+            frame->instr_ptr += frame->next_instr_offset;
             _PyFrame_StackPush(frame, retval);
             LOAD_SP();
             LOAD_IP();
@@ -820,6 +821,7 @@ dummy_func(
             _PyInterpreterFrame *dying = frame;
             frame = tstate->current_frame = dying->previous;
             _PyEval_FrameClearAndPop(tstate, dying);
+            frame->instr_ptr += frame->next_instr_offset;
             _PyFrame_StackPush(frame, retval);
             goto resume_frame;
         }
@@ -844,6 +846,7 @@ dummy_func(
             _PyInterpreterFrame *dying = frame;
             frame = tstate->current_frame = dying->previous;
             _PyEval_FrameClearAndPop(tstate, dying);
+            frame->instr_ptr += frame->next_instr_offset;
             _PyFrame_StackPush(frame, retval);
             goto resume_frame;
         }
@@ -1045,6 +1048,7 @@ dummy_func(
             /* We don't know which of these is relevant here, so keep them equal */
             assert(INLINE_CACHE_ENTRIES_SEND == INLINE_CACHE_ENTRIES_FOR_ITER);
             frame->next_instr_offset = 1 + INLINE_CACHE_ENTRIES_SEND;
+            frame->instr_ptr += frame->next_instr_offset;
             goto resume_frame;
         }
 
@@ -1068,6 +1072,7 @@ dummy_func(
             /* We don't know which of these is relevant here, so keep them equal */
             assert(INLINE_CACHE_ENTRIES_SEND == INLINE_CACHE_ENTRIES_FOR_ITER);
             frame->next_instr_offset = 1 + INLINE_CACHE_ENTRIES_SEND;
+            frame->instr_ptr += frame->next_instr_offset;
             goto resume_frame;
         }
 
@@ -3771,6 +3776,7 @@ dummy_func(
             _PyInterpreterFrame *prev = frame->previous;
             _PyThreadState_PopFrame(tstate, frame);
             frame = tstate->current_frame = prev;
+            frame->instr_ptr += frame->next_instr_offset;
             _PyFrame_StackPush(frame, (PyObject *)gen);
             goto resume_frame;
         }
@@ -3968,7 +3974,6 @@ dummy_func(
 
         op(_SAVE_CURRENT_IP, (--)) {
             #if TIER_ONE
-            assert(frame->next_instr_offset == 0);
             frame->next_instr_offset = (uint16_t)(next_instr - frame->instr_ptr);
             #endif
             #if TIER_TWO

@@ -738,9 +738,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
 
 /* Sets the above local variables from the frame */
 #define SET_LOCALS_FROM_FRAME() \
-    /* Jump back to the last instruction executed... */ \
-    next_instr = frame->instr_ptr + frame->next_instr_offset; \
-    frame->next_instr_offset = 0; \
+    next_instr = frame->instr_ptr; \
     stack_pointer = _PyFrame_GetStackPointer(frame);
 
 start_frame:
@@ -777,6 +775,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
 
 #include "generated_cases.c.h"
 
+    // TODO: update this comment
     /* INSTRUMENTED_LINE has to be here, rather than in bytecodes.c,
      * because it needs to capture frame->instr_ptr before it is updated,
      * as happens in the standard instruction prologue.
@@ -787,7 +786,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
         case INSTRUMENTED_LINE:
 #endif
     {
-        _Py_CODEUNIT *prev = frame->instr_ptr;
+        _Py_CODEUNIT *prev = frame->instr_ptr - frame->next_instr_offset;
         _Py_CODEUNIT *here = frame->instr_ptr = next_instr;
         _PyFrame_SetStackPointer(frame, stack_pointer);
         int original_opcode = _Py_call_instrumentation_line(

@@ -70,6 +70,7 @@
 #else
 #define INSTRUCTION_START(op) \
     do { \
+ if (0) fprintf(stderr, "frame=%p op=%s frame->next_instr_offset = %d\n", frame, _PyOpcode_OpName[op], frame->next_instr_offset); \
         frame->instr_ptr = next_instr++; \
         frame->next_instr_offset = 0; \
     } while(0)
@@ -392,7 +393,8 @@ static inline void _Py_LeaveRecursiveCallPy(PyThreadState *tstate)  {
 #if TIER_ONE
 
 #define LOAD_IP() do { \
-        next_instr = frame->instr_ptr + frame->next_instr_offset; \
+        if (0) assert(frame->next_instr_offset == 0); \
+        next_instr = frame->instr_ptr; \
     } while (0)
 
 #define STORE_SP() \

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