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

1 files changed, 43 insertions, 42 deletions

diff --git a/Include/opcode.h b/Include/opcode.h
index 210e3fe002c..cf11e556067 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)))\