mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

GH-105162: Account for INSTRUMENTED_RESUME in gen.close/throw. (GH-105187)

Browse source
This commit is contained in:
Mark Shannon 2023-06-02 10:39:38 +01:00 • committed by GitHub
parent ee26ca13a1
commit 601ae09f0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Objects/genobject.c
View file

@ -331,6 +331,18 @@ gen_close_iter(PyObject *yf)
return 0;
}
static inline bool
is_resume(_Py_CODEUNIT *instr)
{
return instr->op.code == RESUME || instr->op.code == INSTRUMENTED_RESUME;
}
static inline bool
is_yield(_Py_CODEUNIT *instr)
{
return instr->op.code == YIELD_VALUE || instr->op.code == INSTRUMENTED_YIELD_VALUE;
}
PyObject *
_PyGen_yf(PyGenObject *gen)
{
@ -347,7 +359,7 @@ _PyGen_yf(PyGenObject *gen)
return NULL;
}
_Py_CODEUNIT next = frame->prev_instr[1];
if (next.op.code != RESUME || next.op.arg < 2)
if (!is_resume(&next) || next.op.arg < 2)
{
/* Not in a yield from */
return NULL;
@ -382,8 +394,8 @@ gen_close(PyGenObject *gen, PyObject *args)
_PyInterpreterFrame *frame = (_PyInterpreterFrame *)gen->gi_iframe;
/* It is possible for the previous instruction to not be a
* YIELD_VALUE if the debugger has changed the lineno. */
if (err == 0 && frame->prev_instr[0].op.code == YIELD_VALUE) {
assert(frame->prev_instr[1].op.code == RESUME);
if (err == 0 && is_yield(frame->prev_instr)) {
assert(is_resume(frame->prev_instr + 1));
int exception_handler_depth = frame->prev_instr[0].op.code;
assert(exception_handler_depth > 0);
/* We can safely ignore the outermost try block