python
diff --git a/‎Python/ceval.c‎
Lines changed: 5 additions & 6 deletions b/‎Python/ceval.c‎
Lines changed: 5 additions & 6 deletions
@@ -1372,6 +1372,7 @@ eval_frame_handle_pending(PyThreadState *tstate)
         opcode = _Py_OPCODE(word); \
         if (opcode == op) { \
             oparg = _Py_OPARG(word); \
+            frame->f_lasti = INSTR_OFFSET(); \
             next_instr++; \
             goto PREDICT_ID(op); \
         } \
@@ -1615,12 +1616,10 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
        multiple values.
 
        When the PREDICT() macros are enabled, some opcode pairs follow in
-       direct succession without updating frame->f_lasti.  A successful
-       prediction effectively links the two codes together as if they
-       were a single new opcode; accordingly,frame->f_lasti will point to
-       the first code in the pair (for instance, GET_ITER followed by
-       FOR_ITER is effectively a single opcode and frame->f_lasti will point
-       to the beginning of the combined pair.)
+       direct succession. A successful prediction effectively links the two
+       codes together as if they were a single new opcode, but the value
+       of frame->f_lasti is correctly updated so potential inlined calls
+       or lookups of frame->f_lasti are aways correct when the macros are used.
     */
     assert(frame->f_lasti >= -1);
     _Py_CODEUNIT *next_instr = first_instr + frame->f_lasti + 1;