diff -r 5a29ab5a4785 Misc/NEWS --- a/Misc/NEWS Thu Nov 24 17:20:40 2016 +0900 +++ b/Misc/NEWS Thu Nov 24 15:19:08 2016 +0100 @@ -10,6 +10,10 @@ What's New in Python 3.6.0 release candi Core and Builtins ----------------- +- Issue #28782: Fix a bug in the implementation ``yield from`` when checking + if the next instruction is YIELD_FROM. Regression introduced by WORDCODE + (issue #26647). + Library ------- diff -r 5a29ab5a4785 Objects/genobject.c --- a/Objects/genobject.c Thu Nov 24 17:20:40 2016 +0900 +++ b/Objects/genobject.c Thu Nov 24 15:19:08 2016 +0100 @@ -355,6 +355,14 @@ PyObject * PyObject *bytecode = f->f_code->co_code; unsigned char *code = (unsigned char *)PyBytes_AS_STRING(bytecode); + if (f->f_lasti < 0) { + /* Return immediately if the frame didn't start yet. YIELD_FROM + always come after LOAD_CONST: a code object should not start + with YIELD_FROM */ + assert(code[0] != YIELD_FROM); + return NULL; + } + if (code[f->f_lasti + sizeof(_Py_CODEUNIT)] != YIELD_FROM) return NULL; yf = f->f_stacktop[-1]; @@ -463,6 +471,7 @@ static PyObject * assert(ret == yf); Py_DECREF(ret); /* Termination repetition of YIELD_FROM */ + assert(gen->gi_frame->f_lasti >= 0); gen->gi_frame->f_lasti += sizeof(_Py_CODEUNIT); if (_PyGen_FetchStopIterationValue(&val) == 0) { ret = gen_send_ex(gen, val, 0, 0); diff -r 5a29ab5a4785 Python/ceval.c --- a/Python/ceval.c Thu Nov 24 17:20:40 2016 +0900 +++ b/Python/ceval.c Thu Nov 24 15:19:08 2016 +0100 @@ -2043,6 +2043,7 @@ PyObject * f->f_stacktop = stack_pointer; why = WHY_YIELD; /* and repeat... */ + assert(f->f_lasti >= (int)sizeof(_Py_CODEUNIT)); f->f_lasti -= sizeof(_Py_CODEUNIT); goto fast_yield; }