Skip to content

Commit de9adc3

Browse files
committed
Escape around final close
1 parent d394c7a commit de9adc3

File tree

6 files changed

+249
-2
lines changed

6 files changed

+249
-2
lines changed

Python/bytecodes.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2212,7 +2212,6 @@ dummy_func(
22122212
attr = PyStackRef_FromPyObjectSteal(attr_o);
22132213
}
22142214

2215-
22162215
macro(LOAD_ATTR) =
22172216
_SPECIALIZE_LOAD_ATTR +
22182217
unused/8 +

Python/ceval.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
784784
#endif
785785
uint8_t opcode; /* Current opcode */
786786
int oparg; /* Current opcode argument, if any */
787+
assert(tstate->current_frame == NULL || tstate->current_frame->stackpointer != NULL);
787788

788789
_PyInterpreterFrame entry_frame;
789790

@@ -843,8 +844,8 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
843844
/* Because this avoids the RESUME, we need to update instrumentation */
844845
_Py_Instrument(_PyFrame_GetCode(frame), tstate->interp);
845846
next_instr = frame->instr_ptr;
846-
stack_pointer = _PyFrame_GetStackPointer(frame);
847847
monitor_throw(tstate, frame, next_instr);
848+
stack_pointer = _PyFrame_GetStackPointer(frame);
848849
goto error;
849850
}
850851

0 commit comments

Comments
 (0)