Make sure that frames are correctly deferred

Author: markshannon

Objects/genobject.c

@@ -226,6 +226,9 @@ gen_send_ex2(PyGenObject *gen, PyObject *arg, PyObject **presult,
     gen->gi_frame_state = FRAME_EXECUTING;
     EVAL_CALL_STAT_INC(EVAL_CALL_GENERATOR);
     PyObject *result = _PyEval_EvalFrame(tstate, frame, exc);
+    if (frame->references_immediate) {
+        _PyFrame_Defer(frame, tstate->interp);
+    }
     assert(tstate->exc_info == prev_exc_info);
     assert(gen->gi_exc_state.previous_item == NULL);
     assert(gen->gi_frame_state != FRAME_EXECUTING);

Python/bytecodes.c

@@ -953,6 +953,9 @@ dummy_func(
             _PyInterpreterFrame *dying = frame;
             frame = tstate->current_frame = dying->previous;
             _PyEval_FrameClearAndPop(tstate, dying);
+            if (frame->references_immediate) {
+                _PyFrame_Defer(frame, tstate->interp);
+            }
             _PyFrame_StackPush(frame, retval);
             LOAD_IP(frame->return_offset);
             goto resume_frame;
@@ -977,6 +980,9 @@ dummy_func(
             _PyInterpreterFrame *dying = frame;
             frame = tstate->current_frame = dying->previous;
             _PyEval_FrameClearAndPop(tstate, dying);
+            if (frame->references_immediate) {
+                _PyFrame_Defer(frame, tstate->interp);
+            }
             _PyFrame_StackPush(frame, PyStackRef_FromPyObjectSteal(retval));
             LOAD_IP(frame->return_offset);
             goto resume_frame;
@@ -1192,6 +1198,9 @@ dummy_func(
             _PyInterpreterFrame *gen_frame = frame;
             frame = tstate->current_frame = frame->previous;
             gen_frame->previous = NULL;
+            if (frame->references_immediate) {
+                _PyFrame_Defer(frame, tstate->interp);
+            }
             _PyFrame_StackPush(frame, retval);
             /* We don't know which of these is relevant here, so keep them equal */
             assert(INLINE_CACHE_ENTRIES_SEND == INLINE_CACHE_ENTRIES_FOR_ITER);
@@ -1219,6 +1228,9 @@ dummy_func(
             _PyInterpreterFrame *gen_frame = frame;
             frame = tstate->current_frame = frame->previous;
             gen_frame->previous = NULL;
+            if (frame->references_immediate) {
+                _PyFrame_Defer(frame, tstate->interp);
+            }
             /* We don't know which of these is relevant here, so keep them equal */
             assert(INLINE_CACHE_ENTRIES_SEND == INLINE_CACHE_ENTRIES_FOR_ITER);
             #if TIER_ONE
@@ -4382,6 +4394,9 @@ dummy_func(
             _PyInterpreterFrame *prev = frame->previous;
             _PyThreadState_PopFrame(tstate, frame);
             frame = tstate->current_frame = prev;
+            if (frame->references_immediate) {
+                _PyFrame_Defer(frame, tstate->interp);
+            }
             LOAD_IP(frame->return_offset);
             LOAD_SP();
             LLTRACE_RESUME_FRAME();

Python/ceval.c

@@ -1000,6 +1000,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
     }
 
 resume_with_error:
+    if (frame->references_immediate) {
+        _PyFrame_Defer(frame, tstate->interp);
+    }
     next_instr = frame->instr_ptr;
     stack_pointer = _PyFrame_GetStackPointer(frame);
     goto error;