GH-96793: Implement PEP 479 in bytecode. (GH-99006)

* Handle converting StopIteration to RuntimeError in bytecode.

* Add custom instruction for converting StopIteration into RuntimeError.

2 files changed, 50 insertions, 49 deletions

diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
index 0ef677f..59276c8 100644
--- a/Include/internal/pycore_opcode.h
+++ b/Include/internal/pycore_opcode.h
@@ -205,6 +205,7 @@ const uint8_t _PyOpcode_Deopt[256] = {
     [SETUP_ANNOTATIONS] = SETUP_ANNOTATIONS,
     [SET_ADD] = SET_ADD,
     [SET_UPDATE] = SET_UPDATE,
+    [STOPITERATION_ERROR] = STOPITERATION_ERROR,
     [STORE_ATTR] = STORE_ATTR,
     [STORE_ATTR_ADAPTIVE] = STORE_ATTR,
     [STORE_ATTR_INSTANCE_VALUE] = STORE_ATTR,
@@ -302,30 +303,30 @@ static const char *const _PyOpcode_OpName[263] = {
     [STORE_SUBSCR] = "STORE_SUBSCR",
     [DELETE_SUBSCR] = "DELETE_SUBSCR",
     [COMPARE_OP_INT_JUMP] = "COMPARE_OP_INT_JUMP",
+    [STOPITERATION_ERROR] = "STOPITERATION_ERROR",
     [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",
     [GET_ITER] = "GET_ITER",
     [GET_YIELD_FROM_ITER] = "GET_YIELD_FROM_ITER",
     [PRINT_EXPR] = "PRINT_EXPR",
     [LOAD_BUILD_CLASS] = "LOAD_BUILD_CLASS",
+    [FOR_ITER_RANGE] = "FOR_ITER_RANGE",
     [LOAD_ATTR_ADAPTIVE] = "LOAD_ATTR_ADAPTIVE",
-    [LOAD_ATTR_CLASS] = "LOAD_ATTR_CLASS",
     [LOAD_ASSERTION_ERROR] = "LOAD_ASSERTION_ERROR",
     [RETURN_GENERATOR] = "RETURN_GENERATOR",
+    [LOAD_ATTR_CLASS] = "LOAD_ATTR_CLASS",
     [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",
     [LIST_TO_TUPLE] = "LIST_TO_TUPLE",
     [RETURN_VALUE] = "RETURN_VALUE",
     [IMPORT_STAR] = "IMPORT_STAR",
     [SETUP_ANNOTATIONS] = "SETUP_ANNOTATIONS",
-    [LOAD_ATTR_METHOD_LAZY_DICT] = "LOAD_ATTR_METHOD_LAZY_DICT",
+    [LOAD_ATTR_WITH_HINT] = "LOAD_ATTR_WITH_HINT",
     [ASYNC_GEN_WRAP] = "ASYNC_GEN_WRAP",
     [PREP_RERAISE_STAR] = "PREP_RERAISE_STAR",
     [POP_EXCEPT] = "POP_EXCEPT",
@@ -352,7 +353,7 @@ static const char *const _PyOpcode_OpName[263] = {
     [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_NO_DICT] = "LOAD_ATTR_METHOD_NO_DICT",
+    [LOAD_ATTR_METHOD_LAZY_DICT] = "LOAD_ATTR_METHOD_LAZY_DICT",
     [POP_JUMP_IF_FALSE] = "POP_JUMP_IF_FALSE",
     [POP_JUMP_IF_TRUE] = "POP_JUMP_IF_TRUE",
     [LOAD_GLOBAL] = "LOAD_GLOBAL",
@@ -360,7 +361,7 @@ static const char *const _PyOpcode_OpName[263] = {
     [CONTAINS_OP] = "CONTAINS_OP",
     [RERAISE] = "RERAISE",
     [COPY] = "COPY",
-    [LOAD_ATTR_METHOD_WITH_DICT] = "LOAD_ATTR_METHOD_WITH_DICT",
+    [LOAD_ATTR_METHOD_NO_DICT] = "LOAD_ATTR_METHOD_NO_DICT",
     [BINARY_OP] = "BINARY_OP",
     [SEND] = "SEND",
     [LOAD_FAST] = "LOAD_FAST",
@@ -380,9 +381,9 @@ static const char *const _PyOpcode_OpName[263] = {
     [STORE_DEREF] = "STORE_DEREF",
     [DELETE_DEREF] = "DELETE_DEREF",
     [JUMP_BACKWARD] = "JUMP_BACKWARD",
-    [LOAD_ATTR_METHOD_WITH_VALUES] = "LOAD_ATTR_METHOD_WITH_VALUES",
+    [LOAD_ATTR_METHOD_WITH_DICT] = "LOAD_ATTR_METHOD_WITH_DICT",
     [CALL_FUNCTION_EX] = "CALL_FUNCTION_EX",
-    [LOAD_CONST__LOAD_FAST] = "LOAD_CONST__LOAD_FAST",
+    [LOAD_ATTR_METHOD_WITH_VALUES] = "LOAD_ATTR_METHOD_WITH_VALUES",
     [EXTENDED_ARG] = "EXTENDED_ARG",
     [LIST_APPEND] = "LIST_APPEND",
     [SET_ADD] = "SET_ADD",
@@ -392,26 +393,27 @@ static const char *const _PyOpcode_OpName[263] = {
     [YIELD_VALUE] = "YIELD_VALUE",
     [RESUME] = "RESUME",
     [MATCH_CLASS] = "MATCH_CLASS",
+    [LOAD_CONST__LOAD_FAST] = "LOAD_CONST__LOAD_FAST",
     [LOAD_FAST__LOAD_CONST] = "LOAD_FAST__LOAD_CONST",
-    [LOAD_FAST__LOAD_FAST] = "LOAD_FAST__LOAD_FAST",
     [FORMAT_VALUE] = "FORMAT_VALUE",
     [BUILD_CONST_KEY_MAP] = "BUILD_CONST_KEY_MAP",
     [BUILD_STRING] = "BUILD_STRING",
+    [LOAD_FAST__LOAD_FAST] = "LOAD_FAST__LOAD_FAST",
     [LOAD_GLOBAL_ADAPTIVE] = "LOAD_GLOBAL_ADAPTIVE",
     [LOAD_GLOBAL_BUILTIN] = "LOAD_GLOBAL_BUILTIN",
     [LOAD_GLOBAL_MODULE] = "LOAD_GLOBAL_MODULE",
-    [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",
+    [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",
@@ -419,7 +421,6 @@ static const char *const _PyOpcode_OpName[263] = {
     [UNPACK_SEQUENCE_LIST] = "UNPACK_SEQUENCE_LIST",
     [UNPACK_SEQUENCE_TUPLE] = "UNPACK_SEQUENCE_TUPLE",
     [UNPACK_SEQUENCE_TWO_TUPLE] = "UNPACK_SEQUENCE_TWO_TUPLE",
-    [180] = "<180>",
     [181] = "<181>",
     [182] = "<182>",
     [183] = "<183>",
@@ -506,7 +507,6 @@ static const char *const _PyOpcode_OpName[263] = {
 #endif
 
 #define EXTRA_CASES \
-    case 180: \
     case 181: \
     case 182: \
     case 183: \
diff --git a/Include/opcode.h b/Include/opcode.h
index 661b587..4efa357 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -36,6 +36,7 @@ extern "C" {
 #define CLEANUP_THROW                           55
 #define STORE_SUBSCR                            60
 #define DELETE_SUBSCR                           61
+#define STOPITERATION_ERROR                     63
 #define GET_ITER                                68
 #define GET_YIELD_FROM_ITER                     69
 #define PRINT_EXPR                              70
@@ -162,42 +163,42 @@ extern "C" {
 #define COMPARE_OP_ADAPTIVE                     58
 #define COMPARE_OP_FLOAT_JUMP                   59
 #define COMPARE_OP_INT_JUMP                     62
-#define COMPARE_OP_STR_JUMP                     63
-#define EXTENDED_ARG_QUICK                      64
-#define FOR_ITER_ADAPTIVE                       65
-#define FOR_ITER_LIST                           66
-#define FOR_ITER_RANGE                          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 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                  173
-#define STORE_SUBSCR_DICT                      174
-#define STORE_SUBSCR_LIST_INT                  175
-#define UNPACK_SEQUENCE_ADAPTIVE               176
-#define UNPACK_SEQUENCE_LIST                   177
-#define UNPACK_SEQUENCE_TUPLE                  178
-#define UNPACK_SEQUENCE_TWO_TUPLE              179
+#define COMPARE_OP_STR_JUMP                     64
+#define EXTENDED_ARG_QUICK                      65
+#define FOR_ITER_ADAPTIVE                       66
+#define FOR_ITER_LIST                           67
+#define FOR_ITER_RANGE                          72
+#define LOAD_ATTR_ADAPTIVE                      73
+#define LOAD_ATTR_CLASS                         76
+#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN       77
+#define LOAD_ATTR_INSTANCE_VALUE                78
+#define LOAD_ATTR_MODULE                        79
+#define LOAD_ATTR_PROPERTY                      80
+#define LOAD_ATTR_SLOT                          81
+#define LOAD_ATTR_WITH_HINT                     86
+#define LOAD_ATTR_METHOD_LAZY_DICT             113
+#define LOAD_ATTR_METHOD_NO_DICT               121
+#define LOAD_ATTR_METHOD_WITH_DICT             141
+#define LOAD_ATTR_METHOD_WITH_VALUES           143
+#define LOAD_CONST__LOAD_FAST                  153
+#define LOAD_FAST__LOAD_CONST                  154
+#define LOAD_FAST__LOAD_FAST                   158
+#define LOAD_GLOBAL_ADAPTIVE                   159
+#define LOAD_GLOBAL_BUILTIN                    160
+#define LOAD_GLOBAL_MODULE                     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                 173
+#define STORE_SUBSCR_ADAPTIVE                  174
+#define STORE_SUBSCR_DICT                      175
+#define STORE_SUBSCR_LIST_INT                  176
+#define UNPACK_SEQUENCE_ADAPTIVE               177
+#define UNPACK_SEQUENCE_LIST                   178
+#define UNPACK_SEQUENCE_TUPLE                  179
+#define UNPACK_SEQUENCE_TWO_TUPLE              180
 #define DO_TRACING                             255
 
 #define HAS_ARG(op) ((((op) >= HAVE_ARGUMENT) && (!IS_PSEUDO_OPCODE(op)))\