[Python-checkins] GH-90997: Wrap yield from/await in a virtual try/except StopIteration (GH-96010)

Fri Aug 19 15:33:55 EDT 2022

https://github.com/python/cpython/commit/5bfb3c372bda1113aea1385d4793f073a1d37155
commit: 5bfb3c372bda1113aea1385d4793f073a1d37155
branch: main
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022年08月19日T12:33:44-07:00
summary:
GH-90997: Wrap yield from/await in a virtual try/except StopIteration (GH-96010)
files:
A Misc/NEWS.d/next/Core and Builtins/2022-08-15-11-58-05.gh-issue-90997.bWwV8Q.rst
M Doc/library/dis.rst
M Include/internal/pycore_opcode.h
M Include/opcode.h
M Lib/importlib/_bootstrap_external.py
M Lib/opcode.py
M Lib/test/test_dis.py
M Objects/genobject.c
M Python/ceval.c
M Python/compile.c
M Python/opcode_targets.h

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 63b064e7b444..691819fbca03 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -567,6 +567,17 @@ the original TOS1.
 .. versionchanged:: 3.11
 Exception representation on the stack now consist of one, not three, items.
 
+
+.. opcode:: CLEANUP_THROW
+
+ Handles an exception raised during a :meth:`~generator.throw` or
+ :meth:`~generator.close` call through the current frame. If TOS is an
+ instance of :exc:`StopIteration`, pop three values from the stack and push
+ its ``value`` member. Otherwise, re-raise TOS.
+
+ .. versionadded:: 3.12
+
+
 .. opcode:: BEFORE_ASYNC_WITH
 
 Resolves ``__aenter__`` and ``__aexit__`` from the object on top of the
@@ -1344,10 +1355,14 @@ iterations of the loop.
 .. versionadded:: 3.11
 
 
-.. opcode:: SEND
+.. opcode:: SEND (delta)
+
+ Equivalent to ``TOS = TOS1.send(TOS)``. Used in ``yield from`` and ``await``
+ statements.
 
- Sends ``None`` to the sub-generator of this generator.
- Used in ``yield from`` and ``await`` statements.
+ If the call raises :exc:`StopIteration`, pop both items, push the
+ exception's ``value`` attribute, and increment the bytecode counter by
+ *delta*.
 
 .. versionadded:: 3.11
 
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
index 6906cd5c7881..587590172b56 100644
--- a/Include/internal/pycore_opcode.h
+++ b/Include/internal/pycore_opcode.h
@@ -104,6 +104,7 @@ const uint8_t _PyOpcode_Deopt[256] = {
 [CALL_PY_WITH_DEFAULTS] = CALL,
 [CHECK_EG_MATCH] = CHECK_EG_MATCH,
 [CHECK_EXC_MATCH] = CHECK_EXC_MATCH,
+ [CLEANUP_THROW] = CLEANUP_THROW,
 [COMPARE_OP] = COMPARE_OP,
 [COMPARE_OP_ADAPTIVE] = COMPARE_OP,
 [COMPARE_OP_FLOAT_JUMP] = COMPARE_OP,
@@ -298,38 +299,38 @@ static const char *const _PyOpcode_OpName[267] = {
 [BEFORE_ASYNC_WITH] = "BEFORE_ASYNC_WITH",
 [BEFORE_WITH] = "BEFORE_WITH",
 [END_ASYNC_FOR] = "END_ASYNC_FOR",
+ [CLEANUP_THROW] = "CLEANUP_THROW",
 [CALL_NO_KW_TYPE_1] = "CALL_NO_KW_TYPE_1",
 [COMPARE_OP_ADAPTIVE] = "COMPARE_OP_ADAPTIVE",
 [COMPARE_OP_FLOAT_JUMP] = "COMPARE_OP_FLOAT_JUMP",
 [COMPARE_OP_INT_JUMP] = "COMPARE_OP_INT_JUMP",
- [COMPARE_OP_STR_JUMP] = "COMPARE_OP_STR_JUMP",
 [STORE_SUBSCR] = "STORE_SUBSCR",
 [DELETE_SUBSCR] = "DELETE_SUBSCR",
+ [COMPARE_OP_STR_JUMP] = "COMPARE_OP_STR_JUMP",
 [EXTENDED_ARG_QUICK] = "EXTENDED_ARG_QUICK",
 [FOR_ITER_ADAPTIVE] = "FOR_ITER_ADAPTIVE",
 [FOR_ITER_LIST] = "FOR_ITER_LIST",
 [FOR_ITER_RANGE] = "FOR_ITER_RANGE",
 [JUMP_BACKWARD_QUICK] = "JUMP_BACKWARD_QUICK",
- [LOAD_ATTR_ADAPTIVE] = "LOAD_ATTR_ADAPTIVE",
 [GET_ITER] = "GET_ITER",
 [GET_YIELD_FROM_ITER] = "GET_YIELD_FROM_ITER",
 [PRINT_EXPR] = "PRINT_EXPR",
 [LOAD_BUILD_CLASS] = "LOAD_BUILD_CLASS",
+ [LOAD_ATTR_ADAPTIVE] = "LOAD_ATTR_ADAPTIVE",
 [LOAD_ATTR_CLASS] = "LOAD_ATTR_CLASS",
- [LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN] = "LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN",
 [LOAD_ASSERTION_ERROR] = "LOAD_ASSERTION_ERROR",
 [RETURN_GENERATOR] = "RETURN_GENERATOR",
+ [LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN] = "LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN",
 [LOAD_ATTR_INSTANCE_VALUE] = "LOAD_ATTR_INSTANCE_VALUE",
 [LOAD_ATTR_MODULE] = "LOAD_ATTR_MODULE",
 [LOAD_ATTR_PROPERTY] = "LOAD_ATTR_PROPERTY",
 [LOAD_ATTR_SLOT] = "LOAD_ATTR_SLOT",
 [LOAD_ATTR_WITH_HINT] = "LOAD_ATTR_WITH_HINT",
- [LOAD_ATTR_METHOD_LAZY_DICT] = "LOAD_ATTR_METHOD_LAZY_DICT",
 [LIST_TO_TUPLE] = "LIST_TO_TUPLE",
 [RETURN_VALUE] = "RETURN_VALUE",
 [IMPORT_STAR] = "IMPORT_STAR",
 [SETUP_ANNOTATIONS] = "SETUP_ANNOTATIONS",
- [LOAD_ATTR_METHOD_NO_DICT] = "LOAD_ATTR_METHOD_NO_DICT",
+ [LOAD_ATTR_METHOD_LAZY_DICT] = "LOAD_ATTR_METHOD_LAZY_DICT",
 [ASYNC_GEN_WRAP] = "ASYNC_GEN_WRAP",
 [PREP_RERAISE_STAR] = "PREP_RERAISE_STAR",
 [POP_EXCEPT] = "POP_EXCEPT",
@@ -356,7 +357,7 @@ static const char *const _PyOpcode_OpName[267] = {
 [JUMP_FORWARD] = "JUMP_FORWARD",
 [JUMP_IF_FALSE_OR_POP] = "JUMP_IF_FALSE_OR_POP",
 [JUMP_IF_TRUE_OR_POP] = "JUMP_IF_TRUE_OR_POP",
- [LOAD_ATTR_METHOD_WITH_DICT] = "LOAD_ATTR_METHOD_WITH_DICT",
+ [LOAD_ATTR_METHOD_NO_DICT] = "LOAD_ATTR_METHOD_NO_DICT",
 [POP_JUMP_FORWARD_IF_FALSE] = "POP_JUMP_FORWARD_IF_FALSE",
 [POP_JUMP_FORWARD_IF_TRUE] = "POP_JUMP_FORWARD_IF_TRUE",
 [LOAD_GLOBAL] = "LOAD_GLOBAL",
@@ -364,7 +365,7 @@ static const char *const _PyOpcode_OpName[267] = {
 [CONTAINS_OP] = "CONTAINS_OP",
 [RERAISE] = "RERAISE",
 [COPY] = "COPY",
- [LOAD_ATTR_METHOD_WITH_VALUES] = "LOAD_ATTR_METHOD_WITH_VALUES",
+ [LOAD_ATTR_METHOD_WITH_DICT] = "LOAD_ATTR_METHOD_WITH_DICT",
 [BINARY_OP] = "BINARY_OP",
 [SEND] = "SEND",
 [LOAD_FAST] = "LOAD_FAST",
@@ -384,9 +385,9 @@ static const char *const _PyOpcode_OpName[267] = {
 [STORE_DEREF] = "STORE_DEREF",
 [DELETE_DEREF] = "DELETE_DEREF",
 [JUMP_BACKWARD] = "JUMP_BACKWARD",
- [LOAD_CONST__LOAD_FAST] = "LOAD_CONST__LOAD_FAST",
+ [LOAD_ATTR_METHOD_WITH_VALUES] = "LOAD_ATTR_METHOD_WITH_VALUES",
 [CALL_FUNCTION_EX] = "CALL_FUNCTION_EX",
- [LOAD_FAST__LOAD_CONST] = "LOAD_FAST__LOAD_CONST",
+ [LOAD_CONST__LOAD_FAST] = "LOAD_CONST__LOAD_FAST",
 [EXTENDED_ARG] = "EXTENDED_ARG",
 [LIST_APPEND] = "LIST_APPEND",
 [SET_ADD] = "SET_ADD",
@@ -396,30 +397,31 @@ static const char *const _PyOpcode_OpName[267] = {
 [YIELD_VALUE] = "YIELD_VALUE",
 [RESUME] = "RESUME",
 [MATCH_CLASS] = "MATCH_CLASS",
+ [LOAD_FAST__LOAD_CONST] = "LOAD_FAST__LOAD_CONST",
 [LOAD_FAST__LOAD_FAST] = "LOAD_FAST__LOAD_FAST",
- [LOAD_GLOBAL_ADAPTIVE] = "LOAD_GLOBAL_ADAPTIVE",
 [FORMAT_VALUE] = "FORMAT_VALUE",
 [BUILD_CONST_KEY_MAP] = "BUILD_CONST_KEY_MAP",
 [BUILD_STRING] = "BUILD_STRING",
+ [LOAD_GLOBAL_ADAPTIVE] = "LOAD_GLOBAL_ADAPTIVE",
 [LOAD_GLOBAL_BUILTIN] = "LOAD_GLOBAL_BUILTIN",
 [LOAD_GLOBAL_MODULE] = "LOAD_GLOBAL_MODULE",
 [RESUME_QUICK] = "RESUME_QUICK",
- [STORE_ATTR_ADAPTIVE] = "STORE_ATTR_ADAPTIVE",
 [LIST_EXTEND] = "LIST_EXTEND",
 [SET_UPDATE] = "SET_UPDATE",
 [DICT_MERGE] = "DICT_MERGE",
 [DICT_UPDATE] = "DICT_UPDATE",
+ [STORE_ATTR_ADAPTIVE] = "STORE_ATTR_ADAPTIVE",
 [STORE_ATTR_INSTANCE_VALUE] = "STORE_ATTR_INSTANCE_VALUE",
 [STORE_ATTR_SLOT] = "STORE_ATTR_SLOT",
 [STORE_ATTR_WITH_HINT] = "STORE_ATTR_WITH_HINT",
 [STORE_FAST__LOAD_FAST] = "STORE_FAST__LOAD_FAST",
- [STORE_FAST__STORE_FAST] = "STORE_FAST__STORE_FAST",
 [CALL] = "CALL",
 [KW_NAMES] = "KW_NAMES",
 [POP_JUMP_BACKWARD_IF_NOT_NONE] = "POP_JUMP_BACKWARD_IF_NOT_NONE",
 [POP_JUMP_BACKWARD_IF_NONE] = "POP_JUMP_BACKWARD_IF_NONE",
 [POP_JUMP_BACKWARD_IF_FALSE] = "POP_JUMP_BACKWARD_IF_FALSE",
 [POP_JUMP_BACKWARD_IF_TRUE] = "POP_JUMP_BACKWARD_IF_TRUE",
+ [STORE_FAST__STORE_FAST] = "STORE_FAST__STORE_FAST",
 [STORE_SUBSCR_ADAPTIVE] = "STORE_SUBSCR_ADAPTIVE",
 [STORE_SUBSCR_DICT] = "STORE_SUBSCR_DICT",
 [STORE_SUBSCR_LIST_INT] = "STORE_SUBSCR_LIST_INT",
@@ -427,7 +429,6 @@ static const char *const _PyOpcode_OpName[267] = {
 [UNPACK_SEQUENCE_LIST] = "UNPACK_SEQUENCE_LIST",
 [UNPACK_SEQUENCE_TUPLE] = "UNPACK_SEQUENCE_TUPLE",
 [UNPACK_SEQUENCE_TWO_TUPLE] = "UNPACK_SEQUENCE_TWO_TUPLE",
- [184] = "<184>",
 [185] = "<185>",
 [186] = "<186>",
 [187] = "<187>",
@@ -514,7 +515,6 @@ static const char *const _PyOpcode_OpName[267] = {
 #endif
 
 #define EXTRA_CASES \
- case 184: \
 case 185: \
 case 186: \
 case 187: \
diff --git a/Include/opcode.h b/Include/opcode.h
index 210e3fe002ca..cf11e5560674 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -32,6 +32,7 @@ extern "C" {
 #define BEFORE_ASYNC_WITH 52
 #define BEFORE_WITH 53
 #define END_ASYNC_FOR 54
+#define CLEANUP_THROW 55
 #define STORE_SUBSCR 60
 #define DELETE_SUBSCR 61
 #define GET_ITER 68
@@ -164,48 +165,48 @@ extern "C" {
 #define CALL_NO_KW_METHOD_DESCRIPTOR_O 46
 #define CALL_NO_KW_STR_1 47
 #define CALL_NO_KW_TUPLE_1 48
-#define CALL_NO_KW_TYPE_1 55
-#define COMPARE_OP_ADAPTIVE 56
-#define COMPARE_OP_FLOAT_JUMP 57
-#define COMPARE_OP_INT_JUMP 58
-#define COMPARE_OP_STR_JUMP 59
-#define EXTENDED_ARG_QUICK 62
-#define FOR_ITER_ADAPTIVE 63
-#define FOR_ITER_LIST 64
-#define FOR_ITER_RANGE 65
-#define JUMP_BACKWARD_QUICK 66
-#define LOAD_ATTR_ADAPTIVE 67
-#define LOAD_ATTR_CLASS 72
-#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN 73
-#define LOAD_ATTR_INSTANCE_VALUE 76
-#define LOAD_ATTR_MODULE 77
-#define LOAD_ATTR_PROPERTY 78
-#define LOAD_ATTR_SLOT 79
-#define LOAD_ATTR_WITH_HINT 80
-#define LOAD_ATTR_METHOD_LAZY_DICT 81
-#define LOAD_ATTR_METHOD_NO_DICT 86
-#define LOAD_ATTR_METHOD_WITH_DICT 113
-#define LOAD_ATTR_METHOD_WITH_VALUES 121
-#define LOAD_CONST__LOAD_FAST 141
-#define LOAD_FAST__LOAD_CONST 143
-#define LOAD_FAST__LOAD_FAST 153
-#define LOAD_GLOBAL_ADAPTIVE 154
-#define LOAD_GLOBAL_BUILTIN 158
-#define LOAD_GLOBAL_MODULE 159
-#define RESUME_QUICK 160
-#define STORE_ATTR_ADAPTIVE 161
-#define STORE_ATTR_INSTANCE_VALUE 166
-#define STORE_ATTR_SLOT 167
-#define STORE_ATTR_WITH_HINT 168
-#define STORE_FAST__LOAD_FAST 169
-#define STORE_FAST__STORE_FAST 170
-#define STORE_SUBSCR_ADAPTIVE 177
-#define STORE_SUBSCR_DICT 178
-#define STORE_SUBSCR_LIST_INT 179
-#define UNPACK_SEQUENCE_ADAPTIVE 180
-#define UNPACK_SEQUENCE_LIST 181
-#define UNPACK_SEQUENCE_TUPLE 182
-#define UNPACK_SEQUENCE_TWO_TUPLE 183
+#define CALL_NO_KW_TYPE_1 56
+#define COMPARE_OP_ADAPTIVE 57
+#define COMPARE_OP_FLOAT_JUMP 58
+#define COMPARE_OP_INT_JUMP 59
+#define COMPARE_OP_STR_JUMP 62
+#define EXTENDED_ARG_QUICK 63
+#define FOR_ITER_ADAPTIVE 64
+#define FOR_ITER_LIST 65
+#define FOR_ITER_RANGE 66
+#define JUMP_BACKWARD_QUICK 67
+#define LOAD_ATTR_ADAPTIVE 72
+#define LOAD_ATTR_CLASS 73
+#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN 76
+#define LOAD_ATTR_INSTANCE_VALUE 77
+#define LOAD_ATTR_MODULE 78
+#define LOAD_ATTR_PROPERTY 79
+#define LOAD_ATTR_SLOT 80
+#define LOAD_ATTR_WITH_HINT 81
+#define LOAD_ATTR_METHOD_LAZY_DICT 86
+#define LOAD_ATTR_METHOD_NO_DICT 113
+#define LOAD_ATTR_METHOD_WITH_DICT 121
+#define LOAD_ATTR_METHOD_WITH_VALUES 141
+#define LOAD_CONST__LOAD_FAST 143
+#define LOAD_FAST__LOAD_CONST 153
+#define LOAD_FAST__LOAD_FAST 154
+#define LOAD_GLOBAL_ADAPTIVE 158
+#define LOAD_GLOBAL_BUILTIN 159
+#define LOAD_GLOBAL_MODULE 160
+#define RESUME_QUICK 161
+#define STORE_ATTR_ADAPTIVE 166
+#define STORE_ATTR_INSTANCE_VALUE 167
+#define STORE_ATTR_SLOT 168
+#define STORE_ATTR_WITH_HINT 169
+#define STORE_FAST__LOAD_FAST 170
+#define STORE_FAST__STORE_FAST 177
+#define STORE_SUBSCR_ADAPTIVE 178
+#define STORE_SUBSCR_DICT 179
+#define STORE_SUBSCR_LIST_INT 180
+#define UNPACK_SEQUENCE_ADAPTIVE 181
+#define UNPACK_SEQUENCE_LIST 182
+#define UNPACK_SEQUENCE_TUPLE 183
+#define UNPACK_SEQUENCE_TWO_TUPLE 184
 #define DO_TRACING 255
 
 #define HAS_ARG(op) ((((op) >= HAVE_ARGUMENT) && (!IS_PSEUDO_OPCODE(op)))\
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index 82d204257ed7..b30d0896c849 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@ -411,10 +411,10 @@ def _write_atomic(path, data, mode=0o666):
 # Python 3.12a1 3505 (Specialization/Cache for FOR_ITER)
 # Python 3.12a1 3506 (Add BINARY_SLICE and STORE_SLICE instructions)
 # Python 3.12a1 3507 (Set lineno of module's RESUME to 0)
+# Python 3.12a1 3508 (Add CLEANUP_THROW)
 
 # Python 3.13 will start with 3550
 
-#
 # MAGIC must change whenever the bytecode emitted by the compiler may no
 # longer be understood by older implementations of the eval loop (usually
 # due to the addition of new opcodes).
@@ -424,7 +424,7 @@ def _write_atomic(path, data, mode=0o666):
 # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
 # in PC/launcher.c must also be updated.
 
-MAGIC_NUMBER = (3507).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3508).to_bytes(2, 'little') + b'\r\n'
 
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c
 
diff --git a/Lib/opcode.py b/Lib/opcode.py
index 665852291a69..52c1271868e3 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -104,6 +104,7 @@ def pseudo_op(name, op, real_ops):
 def_op('BEFORE_ASYNC_WITH', 52)
 def_op('BEFORE_WITH', 53)
 def_op('END_ASYNC_FOR', 54)
+def_op('CLEANUP_THROW', 55)
 
 def_op('STORE_SUBSCR', 60)
 def_op('DELETE_SUBSCR', 61)
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index f07e7c860547..67cb1502add9 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -507,26 +507,31 @@ async def _asyncwith(c):
 LOAD_CONST 0 (None)
 RETURN_VALUE
 
-%3d >> PUSH_EXC_INFO
+%3d >> CLEANUP_THROW
+ JUMP_BACKWARD 24 (to 22)
+ >> CLEANUP_THROW
+ JUMP_BACKWARD 9 (to 56)
+ >> PUSH_EXC_INFO
 WITH_EXCEPT_START
 GET_AWAITABLE 2
 LOAD_CONST 0 (None)
- >> SEND 3 (to 82)
+ >> SEND 4 (to 92)
 YIELD_VALUE 6
 RESUME 3
- JUMP_BACKWARD_NO_INTERRUPT 4 (to 74)
- >> POP_JUMP_FORWARD_IF_TRUE 1 (to 86)
+ JUMP_BACKWARD_NO_INTERRUPT 4 (to 82)
+ >> CLEANUP_THROW
+ >> POP_JUMP_FORWARD_IF_TRUE 1 (to 96)
 RERAISE 2
 >> POP_TOP
 POP_EXCEPT
 POP_TOP
 POP_TOP
- JUMP_BACKWARD 19 (to 58)
+ JUMP_BACKWARD 24 (to 58)
 >> COPY 3
 POP_EXCEPT
 RERAISE 1
 ExceptionTable:
-2 rows
+6 rows
 """ % (_asyncwith.__code__.co_firstlineno,
 _asyncwith.__code__.co_firstlineno + 1,
 _asyncwith.__code__.co_firstlineno + 2,
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-08-15-11-58-05.gh-issue-90997.bWwV8Q.rst b/Misc/NEWS.d/next/Core and Builtins/2022-08-15-11-58-05.gh-issue-90997.bWwV8Q.rst
new file mode 100644
index 000000000000..8db714e59e15
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-08-15-11-58-05.gh-issue-90997.bWwV8Q.rst	
@@ -0,0 +1,3 @@
+Compile virtual :keyword:`try`/:keyword:`except` blocks to handle exceptions
+raised during :meth:`~generator.close` or :meth:`~generator.throw` calls
+through a suspended frame.
diff --git a/Objects/genobject.c b/Objects/genobject.c
index 2b45e28cbf16..da4afecc69c8 100644
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -485,26 +485,7 @@ _gen_throw(PyGenObject *gen, int close_on_genexit,
 }
 Py_DECREF(yf);
 if (!ret) {
- PyObject *val;
- /* Pop subiterator from stack */
- assert(gen->gi_frame_state < FRAME_CLEARED);
- ret = _PyFrame_StackPop((_PyInterpreterFrame *)gen->gi_iframe);
- assert(ret == yf);
- Py_DECREF(ret);
- // XXX: Performing this jump ourselves is awkward and problematic.
- // See https://github.com/python/cpython/pull/31968.
- /* Termination repetition of SEND loop */
- assert(_PyInterpreterFrame_LASTI(frame) >= 0);
- /* Backup to SEND */
- assert(_Py_OPCODE(frame->prev_instr[-1]) == SEND);
- int jump = _Py_OPARG(frame->prev_instr[-1]);
- frame->prev_instr += jump - 1;
- if (_PyGen_FetchStopIterationValue(&val) == 0) {
- ret = gen_send(gen, val);
- Py_DECREF(val);
- } else {
- ret = gen_send_ex(gen, Py_None, 1, 0);
- }
+ ret = gen_send_ex(gen, Py_None, 1, 0);
 }
 return ret;
 }
diff --git a/Python/ceval.c b/Python/ceval.c
index 8c17e51e8085..7024addfe626 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2668,6 +2668,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
 }
 
 TARGET(YIELD_VALUE) {
+ // NOTE: It's important that YIELD_VALUE never raises an exception!
+ // The compiler treats any exception raised here as a failed close()
+ // or throw() call.
 assert(oparg == STACK_LEVEL());
 assert(frame->is_entry);
 PyObject *retval = POP();
@@ -2746,6 +2749,26 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
 }
 }
 
+ TARGET(CLEANUP_THROW) {
+ assert(throwflag);
+ PyObject *exc_value = TOP();
+ assert(exc_value && PyExceptionInstance_Check(exc_value));
+ if (PyErr_GivenExceptionMatches(exc_value, PyExc_StopIteration)) {
+ PyObject *value = ((PyStopIterationObject *)exc_value)->value;
+ Py_INCREF(value);
+ Py_DECREF(POP()); // The StopIteration.
+ Py_DECREF(POP()); // The last sent value.
+ Py_DECREF(POP()); // The delegated sub-iterator.
+ PUSH(value);
+ DISPATCH();
+ }
+ Py_INCREF(exc_value);
+ PyObject *exc_type = Py_NewRef(Py_TYPE(exc_value));
+ PyObject *exc_traceback = PyException_GetTraceback(exc_value);
+ _PyErr_Restore(tstate, exc_type, exc_value, exc_traceback);
+ goto exception_unwind;
+ }
+
 TARGET(LOAD_ASSERTION_ERROR) {
 PyObject *value = PyExc_AssertionError;
 Py_INCREF(value);
diff --git a/Python/compile.c b/Python/compile.c
index 3dec7b5edfb5..339e0e792be4 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1234,6 +1234,8 @@ stack_effect(int opcode, int oparg, int jump)
 return 0;
 case END_ASYNC_FOR:
 return -2;
+ case CLEANUP_THROW:
+ return -2;
 case FORMAT_VALUE:
 /* If there's a fmt_spec on the stack, we go from 2->1,
 else 1->1. */
@@ -1946,17 +1948,22 @@ compiler_call_exit_with_nones(struct compiler *c) {
 static int
 compiler_add_yield_from(struct compiler *c, int await)
 {
- NEW_JUMP_TARGET_LABEL(c, start);
- NEW_JUMP_TARGET_LABEL(c, resume);
+ NEW_JUMP_TARGET_LABEL(c, send);
+ NEW_JUMP_TARGET_LABEL(c, fail);
 NEW_JUMP_TARGET_LABEL(c, exit);
 
- USE_LABEL(c, start);
+ USE_LABEL(c, send);
 ADDOP_JUMP(c, SEND, exit);
-
- USE_LABEL(c, resume);
+ // Set up a virtual try/except to handle when StopIteration is raised during
+ // a close or throw call. The only way YIELD_VALUE raises if they do!
+ ADDOP_JUMP(c, SETUP_FINALLY, fail);
 ADDOP_I(c, YIELD_VALUE, 0);
+ ADDOP_NOLINE(c, POP_BLOCK);
 ADDOP_I(c, RESUME, await ? 3 : 2);
- ADDOP_JUMP(c, JUMP_NO_INTERRUPT, start);
+ ADDOP_JUMP(c, JUMP_NO_INTERRUPT, send);
+
+ USE_LABEL(c, fail);
+ ADDOP(c, CLEANUP_THROW);
 
 USE_LABEL(c, exit);
 return 1;
diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index db4bbc466a94..7c782d101c1b 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -54,38 +54,38 @@ static void *opcode_targets[256] = {
 &&TARGET_BEFORE_ASYNC_WITH,
 &&TARGET_BEFORE_WITH,
 &&TARGET_END_ASYNC_FOR,
+ &&TARGET_CLEANUP_THROW,
 &&TARGET_CALL_NO_KW_TYPE_1,
 &&TARGET_COMPARE_OP_ADAPTIVE,
 &&TARGET_COMPARE_OP_FLOAT_JUMP,
 &&TARGET_COMPARE_OP_INT_JUMP,
- &&TARGET_COMPARE_OP_STR_JUMP,
 &&TARGET_STORE_SUBSCR,
 &&TARGET_DELETE_SUBSCR,
+ &&TARGET_COMPARE_OP_STR_JUMP,
 &&TARGET_EXTENDED_ARG_QUICK,
 &&TARGET_FOR_ITER_ADAPTIVE,
 &&TARGET_FOR_ITER_LIST,
 &&TARGET_FOR_ITER_RANGE,
 &&TARGET_JUMP_BACKWARD_QUICK,
- &&TARGET_LOAD_ATTR_ADAPTIVE,
 &&TARGET_GET_ITER,
 &&TARGET_GET_YIELD_FROM_ITER,
 &&TARGET_PRINT_EXPR,
 &&TARGET_LOAD_BUILD_CLASS,
+ &&TARGET_LOAD_ATTR_ADAPTIVE,
 &&TARGET_LOAD_ATTR_CLASS,
- &&TARGET_LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN,
 &&TARGET_LOAD_ASSERTION_ERROR,
 &&TARGET_RETURN_GENERATOR,
+ &&TARGET_LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN,
 &&TARGET_LOAD_ATTR_INSTANCE_VALUE,
 &&TARGET_LOAD_ATTR_MODULE,
 &&TARGET_LOAD_ATTR_PROPERTY,
 &&TARGET_LOAD_ATTR_SLOT,
 &&TARGET_LOAD_ATTR_WITH_HINT,
- &&TARGET_LOAD_ATTR_METHOD_LAZY_DICT,
 &&TARGET_LIST_TO_TUPLE,
 &&TARGET_RETURN_VALUE,
 &&TARGET_IMPORT_STAR,
 &&TARGET_SETUP_ANNOTATIONS,
- &&TARGET_LOAD_ATTR_METHOD_NO_DICT,
+ &&TARGET_LOAD_ATTR_METHOD_LAZY_DICT,
 &&TARGET_ASYNC_GEN_WRAP,
 &&TARGET_PREP_RERAISE_STAR,
 &&TARGET_POP_EXCEPT,
@@ -112,7 +112,7 @@ static void *opcode_targets[256] = {
 &&TARGET_JUMP_FORWARD,
 &&TARGET_JUMP_IF_FALSE_OR_POP,
 &&TARGET_JUMP_IF_TRUE_OR_POP,
- &&TARGET_LOAD_ATTR_METHOD_WITH_DICT,
+ &&TARGET_LOAD_ATTR_METHOD_NO_DICT,
 &&TARGET_POP_JUMP_FORWARD_IF_FALSE,
 &&TARGET_POP_JUMP_FORWARD_IF_TRUE,
 &&TARGET_LOAD_GLOBAL,
@@ -120,7 +120,7 @@ static void *opcode_targets[256] = {
 &&TARGET_CONTAINS_OP,
 &&TARGET_RERAISE,
 &&TARGET_COPY,
- &&TARGET_LOAD_ATTR_METHOD_WITH_VALUES,
+ &&TARGET_LOAD_ATTR_METHOD_WITH_DICT,
 &&TARGET_BINARY_OP,
 &&TARGET_SEND,
 &&TARGET_LOAD_FAST,
@@ -140,9 +140,9 @@ static void *opcode_targets[256] = {
 &&TARGET_STORE_DEREF,
 &&TARGET_DELETE_DEREF,
 &&TARGET_JUMP_BACKWARD,
- &&TARGET_LOAD_CONST__LOAD_FAST,
+ &&TARGET_LOAD_ATTR_METHOD_WITH_VALUES,
 &&TARGET_CALL_FUNCTION_EX,
- &&TARGET_LOAD_FAST__LOAD_CONST,
+ &&TARGET_LOAD_CONST__LOAD_FAST,
 &&TARGET_EXTENDED_ARG,
 &&TARGET_LIST_APPEND,
 &&TARGET_SET_ADD,
@@ -152,30 +152,31 @@ static void *opcode_targets[256] = {
 &&TARGET_YIELD_VALUE,
 &&TARGET_RESUME,
 &&TARGET_MATCH_CLASS,
+ &&TARGET_LOAD_FAST__LOAD_CONST,
 &&TARGET_LOAD_FAST__LOAD_FAST,
- &&TARGET_LOAD_GLOBAL_ADAPTIVE,
 &&TARGET_FORMAT_VALUE,
 &&TARGET_BUILD_CONST_KEY_MAP,
 &&TARGET_BUILD_STRING,
+ &&TARGET_LOAD_GLOBAL_ADAPTIVE,
 &&TARGET_LOAD_GLOBAL_BUILTIN,
 &&TARGET_LOAD_GLOBAL_MODULE,
 &&TARGET_RESUME_QUICK,
- &&TARGET_STORE_ATTR_ADAPTIVE,
 &&TARGET_LIST_EXTEND,
 &&TARGET_SET_UPDATE,
 &&TARGET_DICT_MERGE,
 &&TARGET_DICT_UPDATE,
+ &&TARGET_STORE_ATTR_ADAPTIVE,
 &&TARGET_STORE_ATTR_INSTANCE_VALUE,
 &&TARGET_STORE_ATTR_SLOT,
 &&TARGET_STORE_ATTR_WITH_HINT,
 &&TARGET_STORE_FAST__LOAD_FAST,
- &&TARGET_STORE_FAST__STORE_FAST,
 &&TARGET_CALL,
 &&TARGET_KW_NAMES,
 &&TARGET_POP_JUMP_BACKWARD_IF_NOT_NONE,
 &&TARGET_POP_JUMP_BACKWARD_IF_NONE,
 &&TARGET_POP_JUMP_BACKWARD_IF_FALSE,
 &&TARGET_POP_JUMP_BACKWARD_IF_TRUE,
+ &&TARGET_STORE_FAST__STORE_FAST,
 &&TARGET_STORE_SUBSCR_ADAPTIVE,
 &&TARGET_STORE_SUBSCR_DICT,
 &&TARGET_STORE_SUBSCR_LIST_INT,
@@ -253,6 +254,5 @@ static void *opcode_targets[256] = {
 &&_unknown_opcode,
 &&_unknown_opcode,
 &&_unknown_opcode,
- &&_unknown_opcode,
 &&TARGET_DO_TRACING
 };
