GH-90690: Remove `PRECALL` instruction (GH-92925)

3 files changed, 136 insertions, 151 deletions

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 96cc9dcae11..3d198432741 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -82,12 +82,6 @@ typedef struct {
 
 typedef struct {
     _Py_CODEUNIT counter;
-} _PyPrecallCache;
-
-#define INLINE_CACHE_ENTRIES_PRECALL CACHE_ENTRIES(_PyPrecallCache)
-
-typedef struct {
-    _Py_CODEUNIT counter;
 } _PyStoreSubscrCache;
 
 #define INLINE_CACHE_ENTRIES_STORE_SUBSCR CACHE_ENTRIES(_PyStoreSubscrCache)
@@ -249,8 +243,6 @@ extern int _Py_Specialize_BinarySubscr(PyObject *sub, PyObject *container, _Py_C
 extern int _Py_Specialize_StoreSubscr(PyObject *container, PyObject *sub, _Py_CODEUNIT *instr);
 extern int _Py_Specialize_Call(PyObject *callable, _Py_CODEUNIT *instr,
                                int nargs, PyObject *kwnames);
-extern int _Py_Specialize_Precall(PyObject *callable, _Py_CODEUNIT *instr,
-                                  int nargs, PyObject *kwnames, int oparg);
 extern void _Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr,
                                     int oparg, PyObject **locals);
 extern void _Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs,
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
index 09f65014671..17a68f030b0 100644
--- a/Include/internal/pycore_opcode.h
+++ b/Include/internal/pycore_opcode.h
@@ -50,7 +50,6 @@ const uint8_t _PyOpcode_Caches[256] = {
     [LOAD_GLOBAL] = 5,
     [BINARY_OP] = 1,
     [LOAD_METHOD] = 10,
-    [PRECALL] = 1,
     [CALL] = 4,
 };
 
@@ -84,7 +83,22 @@ const uint8_t _PyOpcode_Deopt[256] = {
     [CACHE] = CACHE,
     [CALL] = CALL,
     [CALL_ADAPTIVE] = CALL,
+    [CALL_BOUND_METHOD_EXACT_ARGS] = CALL,
+    [CALL_BUILTIN_CLASS] = CALL,
+    [CALL_BUILTIN_FAST_WITH_KEYWORDS] = CALL,
     [CALL_FUNCTION_EX] = CALL_FUNCTION_EX,
+    [CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = CALL,
+    [CALL_NO_KW_BUILTIN_FAST] = CALL,
+    [CALL_NO_KW_BUILTIN_O] = CALL,
+    [CALL_NO_KW_ISINSTANCE] = CALL,
+    [CALL_NO_KW_LEN] = CALL,
+    [CALL_NO_KW_LIST_APPEND] = CALL,
+    [CALL_NO_KW_METHOD_DESCRIPTOR_FAST] = CALL,
+    [CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = CALL,
+    [CALL_NO_KW_METHOD_DESCRIPTOR_O] = CALL,
+    [CALL_NO_KW_STR_1] = CALL,
+    [CALL_NO_KW_TUPLE_1] = CALL,
+    [CALL_NO_KW_TYPE_1] = CALL,
     [CALL_PY_EXACT_ARGS] = CALL,
     [CALL_PY_WITH_DEFAULTS] = CALL,
     [CHECK_EG_MATCH] = CHECK_EG_MATCH,
@@ -176,24 +190,6 @@ const uint8_t _PyOpcode_Deopt[256] = {
     [POP_JUMP_FORWARD_IF_NOT_NONE] = POP_JUMP_FORWARD_IF_NOT_NONE,
     [POP_JUMP_FORWARD_IF_TRUE] = POP_JUMP_FORWARD_IF_TRUE,
     [POP_TOP] = POP_TOP,
-    [PRECALL] = PRECALL,
-    [PRECALL_ADAPTIVE] = PRECALL,
-    [PRECALL_BOUND_METHOD] = PRECALL,
-    [PRECALL_BUILTIN_CLASS] = PRECALL,
-    [PRECALL_BUILTIN_FAST_WITH_KEYWORDS] = PRECALL,
-    [PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = PRECALL,
-    [PRECALL_NO_KW_BUILTIN_FAST] = PRECALL,
-    [PRECALL_NO_KW_BUILTIN_O] = PRECALL,
-    [PRECALL_NO_KW_ISINSTANCE] = PRECALL,
-    [PRECALL_NO_KW_LEN] = PRECALL,
-    [PRECALL_NO_KW_LIST_APPEND] = PRECALL,
-    [PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST] = PRECALL,
-    [PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = PRECALL,
-    [PRECALL_NO_KW_METHOD_DESCRIPTOR_O] = PRECALL,
-    [PRECALL_NO_KW_STR_1] = PRECALL,
-    [PRECALL_NO_KW_TUPLE_1] = PRECALL,
-    [PRECALL_NO_KW_TYPE_1] = PRECALL,
-    [PRECALL_PYFUNC] = PRECALL,
     [PREP_RERAISE_STAR] = PREP_RERAISE_STAR,
     [PRINT_EXPR] = PRINT_EXPR,
     [PUSH_EXC_INFO] = PUSH_EXC_INFO,
@@ -268,7 +264,22 @@ const uint8_t _PyOpcode_Original[256] = {
     [CACHE] = CACHE,
     [CALL] = CALL,
     [CALL_ADAPTIVE] = CALL,
+    [CALL_BOUND_METHOD_EXACT_ARGS] = CALL,
+    [CALL_BUILTIN_CLASS] = CALL,
+    [CALL_BUILTIN_FAST_WITH_KEYWORDS] = CALL,
     [CALL_FUNCTION_EX] = CALL_FUNCTION_EX,
+    [CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = CALL,
+    [CALL_NO_KW_BUILTIN_FAST] = CALL,
+    [CALL_NO_KW_BUILTIN_O] = CALL,
+    [CALL_NO_KW_ISINSTANCE] = CALL,
+    [CALL_NO_KW_LEN] = CALL,
+    [CALL_NO_KW_LIST_APPEND] = CALL,
+    [CALL_NO_KW_METHOD_DESCRIPTOR_FAST] = CALL,
+    [CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = CALL,
+    [CALL_NO_KW_METHOD_DESCRIPTOR_O] = CALL,
+    [CALL_NO_KW_STR_1] = CALL,
+    [CALL_NO_KW_TUPLE_1] = CALL,
+    [CALL_NO_KW_TYPE_1] = CALL,
     [CALL_PY_EXACT_ARGS] = CALL,
     [CALL_PY_WITH_DEFAULTS] = CALL,
     [CHECK_EG_MATCH] = CHECK_EG_MATCH,
@@ -360,24 +371,6 @@ const uint8_t _PyOpcode_Original[256] = {
     [POP_JUMP_FORWARD_IF_NOT_NONE] = POP_JUMP_FORWARD_IF_NOT_NONE,
     [POP_JUMP_FORWARD_IF_TRUE] = POP_JUMP_FORWARD_IF_TRUE,
     [POP_TOP] = POP_TOP,
-    [PRECALL] = PRECALL,
-    [PRECALL_ADAPTIVE] = PRECALL,
-    [PRECALL_BOUND_METHOD] = PRECALL,
-    [PRECALL_BUILTIN_CLASS] = PRECALL,
-    [PRECALL_BUILTIN_FAST_WITH_KEYWORDS] = PRECALL,
-    [PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = PRECALL,
-    [PRECALL_NO_KW_BUILTIN_FAST] = PRECALL,
-    [PRECALL_NO_KW_BUILTIN_O] = PRECALL,
-    [PRECALL_NO_KW_ISINSTANCE] = PRECALL,
-    [PRECALL_NO_KW_LEN] = PRECALL,
-    [PRECALL_NO_KW_LIST_APPEND] = PRECALL,
-    [PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST] = PRECALL,
-    [PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = PRECALL,
-    [PRECALL_NO_KW_METHOD_DESCRIPTOR_O] = PRECALL,
-    [PRECALL_NO_KW_STR_1] = PRECALL,
-    [PRECALL_NO_KW_TUPLE_1] = PRECALL,
-    [PRECALL_NO_KW_TYPE_1] = PRECALL,
-    [PRECALL_PYFUNC] = PRECALL,
     [PREP_RERAISE_STAR] = PREP_RERAISE_STAR,
     [PRINT_EXPR] = PRINT_EXPR,
     [PUSH_EXC_INFO] = PUSH_EXC_INFO,
@@ -451,62 +444,62 @@ static const char *const _PyOpcode_OpName[256] = {
     [CALL_PY_EXACT_ARGS] = "CALL_PY_EXACT_ARGS",
     [CALL_PY_WITH_DEFAULTS] = "CALL_PY_WITH_DEFAULTS",
     [BINARY_SUBSCR] = "BINARY_SUBSCR",
-    [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",
+    [CALL_BOUND_METHOD_EXACT_ARGS] = "CALL_BOUND_METHOD_EXACT_ARGS",
+    [CALL_BUILTIN_CLASS] = "CALL_BUILTIN_CLASS",
+    [CALL_BUILTIN_FAST_WITH_KEYWORDS] = "CALL_BUILTIN_FAST_WITH_KEYWORDS",
+    [CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = "CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS",
     [GET_LEN] = "GET_LEN",
     [MATCH_MAPPING] = "MATCH_MAPPING",
     [MATCH_SEQUENCE] = "MATCH_SEQUENCE",
     [MATCH_KEYS] = "MATCH_KEYS",
-    [EXTENDED_ARG_QUICK] = "EXTENDED_ARG_QUICK",
+    [CALL_NO_KW_BUILTIN_FAST] = "CALL_NO_KW_BUILTIN_FAST",
     [PUSH_EXC_INFO] = "PUSH_EXC_INFO",
     [CHECK_EXC_MATCH] = "CHECK_EXC_MATCH",
     [CHECK_EG_MATCH] = "CHECK_EG_MATCH",
+    [CALL_NO_KW_BUILTIN_O] = "CALL_NO_KW_BUILTIN_O",
+    [CALL_NO_KW_ISINSTANCE] = "CALL_NO_KW_ISINSTANCE",
+    [CALL_NO_KW_LEN] = "CALL_NO_KW_LEN",
+    [CALL_NO_KW_LIST_APPEND] = "CALL_NO_KW_LIST_APPEND",
+    [CALL_NO_KW_METHOD_DESCRIPTOR_FAST] = "CALL_NO_KW_METHOD_DESCRIPTOR_FAST",
+    [CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = "CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS",
+    [CALL_NO_KW_METHOD_DESCRIPTOR_O] = "CALL_NO_KW_METHOD_DESCRIPTOR_O",
+    [CALL_NO_KW_STR_1] = "CALL_NO_KW_STR_1",
+    [CALL_NO_KW_TUPLE_1] = "CALL_NO_KW_TUPLE_1",
+    [CALL_NO_KW_TYPE_1] = "CALL_NO_KW_TYPE_1",
+    [COMPARE_OP_ADAPTIVE] = "COMPARE_OP_ADAPTIVE",
+    [WITH_EXCEPT_START] = "WITH_EXCEPT_START",
+    [GET_AITER] = "GET_AITER",
+    [GET_ANEXT] = "GET_ANEXT",
+    [BEFORE_ASYNC_WITH] = "BEFORE_ASYNC_WITH",
+    [BEFORE_WITH] = "BEFORE_WITH",
+    [END_ASYNC_FOR] = "END_ASYNC_FOR",
+    [COMPARE_OP_FLOAT_JUMP] = "COMPARE_OP_FLOAT_JUMP",
+    [COMPARE_OP_INT_JUMP] = "COMPARE_OP_INT_JUMP",
+    [COMPARE_OP_STR_JUMP] = "COMPARE_OP_STR_JUMP",
+    [EXTENDED_ARG_QUICK] = "EXTENDED_ARG_QUICK",
     [JUMP_BACKWARD_QUICK] = "JUMP_BACKWARD_QUICK",
+    [STORE_SUBSCR] = "STORE_SUBSCR",
+    [DELETE_SUBSCR] = "DELETE_SUBSCR",
     [LOAD_ATTR_ADAPTIVE] = "LOAD_ATTR_ADAPTIVE",
     [LOAD_ATTR_INSTANCE_VALUE] = "LOAD_ATTR_INSTANCE_VALUE",
     [LOAD_ATTR_MODULE] = "LOAD_ATTR_MODULE",
     [LOAD_ATTR_SLOT] = "LOAD_ATTR_SLOT",
     [LOAD_ATTR_WITH_HINT] = "LOAD_ATTR_WITH_HINT",
     [LOAD_CONST__LOAD_FAST] = "LOAD_CONST__LOAD_FAST",
+    [GET_ITER] = "GET_ITER",
+    [GET_YIELD_FROM_ITER] = "GET_YIELD_FROM_ITER",
+    [PRINT_EXPR] = "PRINT_EXPR",
+    [LOAD_BUILD_CLASS] = "LOAD_BUILD_CLASS",
     [LOAD_FAST__LOAD_CONST] = "LOAD_FAST__LOAD_CONST",
     [LOAD_FAST__LOAD_FAST] = "LOAD_FAST__LOAD_FAST",
+    [LOAD_ASSERTION_ERROR] = "LOAD_ASSERTION_ERROR",
+    [RETURN_GENERATOR] = "RETURN_GENERATOR",
     [LOAD_GLOBAL_ADAPTIVE] = "LOAD_GLOBAL_ADAPTIVE",
     [LOAD_GLOBAL_BUILTIN] = "LOAD_GLOBAL_BUILTIN",
-    [WITH_EXCEPT_START] = "WITH_EXCEPT_START",
-    [GET_AITER] = "GET_AITER",
-    [GET_ANEXT] = "GET_ANEXT",
-    [BEFORE_ASYNC_WITH] = "BEFORE_ASYNC_WITH",
-    [BEFORE_WITH] = "BEFORE_WITH",
-    [END_ASYNC_FOR] = "END_ASYNC_FOR",
     [LOAD_GLOBAL_MODULE] = "LOAD_GLOBAL_MODULE",
     [LOAD_METHOD_ADAPTIVE] = "LOAD_METHOD_ADAPTIVE",
     [LOAD_METHOD_CLASS] = "LOAD_METHOD_CLASS",
     [LOAD_METHOD_MODULE] = "LOAD_METHOD_MODULE",
-    [LOAD_METHOD_NO_DICT] = "LOAD_METHOD_NO_DICT",
-    [STORE_SUBSCR] = "STORE_SUBSCR",
-    [DELETE_SUBSCR] = "DELETE_SUBSCR",
-    [LOAD_METHOD_WITH_DICT] = "LOAD_METHOD_WITH_DICT",
-    [LOAD_METHOD_WITH_VALUES] = "LOAD_METHOD_WITH_VALUES",
-    [PRECALL_ADAPTIVE] = "PRECALL_ADAPTIVE",
-    [PRECALL_BOUND_METHOD] = "PRECALL_BOUND_METHOD",
-    [PRECALL_BUILTIN_CLASS] = "PRECALL_BUILTIN_CLASS",
-    [PRECALL_BUILTIN_FAST_WITH_KEYWORDS] = "PRECALL_BUILTIN_FAST_WITH_KEYWORDS",
-    [GET_ITER] = "GET_ITER",
-    [GET_YIELD_FROM_ITER] = "GET_YIELD_FROM_ITER",
-    [PRINT_EXPR] = "PRINT_EXPR",
-    [LOAD_BUILD_CLASS] = "LOAD_BUILD_CLASS",
-    [PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = "PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS",
-    [PRECALL_NO_KW_BUILTIN_FAST] = "PRECALL_NO_KW_BUILTIN_FAST",
-    [LOAD_ASSERTION_ERROR] = "LOAD_ASSERTION_ERROR",
-    [RETURN_GENERATOR] = "RETURN_GENERATOR",
-    [PRECALL_NO_KW_BUILTIN_O] = "PRECALL_NO_KW_BUILTIN_O",
-    [PRECALL_NO_KW_ISINSTANCE] = "PRECALL_NO_KW_ISINSTANCE",
-    [PRECALL_NO_KW_LEN] = "PRECALL_NO_KW_LEN",
-    [PRECALL_NO_KW_LIST_APPEND] = "PRECALL_NO_KW_LIST_APPEND",
-    [PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST] = "PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST",
-    [PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = "PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS",
     [LIST_TO_TUPLE] = "LIST_TO_TUPLE",
     [RETURN_VALUE] = "RETURN_VALUE",
     [IMPORT_STAR] = "IMPORT_STAR",
@@ -538,7 +531,7 @@ static const char *const _PyOpcode_OpName[256] = {
     [JUMP_FORWARD] = "JUMP_FORWARD",
     [JUMP_IF_FALSE_OR_POP] = "JUMP_IF_FALSE_OR_POP",
     [JUMP_IF_TRUE_OR_POP] = "JUMP_IF_TRUE_OR_POP",
-    [PRECALL_NO_KW_METHOD_DESCRIPTOR_O] = "PRECALL_NO_KW_METHOD_DESCRIPTOR_O",
+    [LOAD_METHOD_NO_DICT] = "LOAD_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",
@@ -546,13 +539,13 @@ static const char *const _PyOpcode_OpName[256] = {
     [CONTAINS_OP] = "CONTAINS_OP",
     [RERAISE] = "RERAISE",
     [COPY] = "COPY",
-    [PRECALL_NO_KW_STR_1] = "PRECALL_NO_KW_STR_1",
+    [LOAD_METHOD_WITH_DICT] = "LOAD_METHOD_WITH_DICT",
     [BINARY_OP] = "BINARY_OP",
     [SEND] = "SEND",
     [LOAD_FAST] = "LOAD_FAST",
     [STORE_FAST] = "STORE_FAST",
     [DELETE_FAST] = "DELETE_FAST",
-    [PRECALL_NO_KW_TUPLE_1] = "PRECALL_NO_KW_TUPLE_1",
+    [LOAD_METHOD_WITH_VALUES] = "LOAD_METHOD_WITH_VALUES",
     [POP_JUMP_FORWARD_IF_NOT_NONE] = "POP_JUMP_FORWARD_IF_NOT_NONE",
     [POP_JUMP_FORWARD_IF_NONE] = "POP_JUMP_FORWARD_IF_NONE",
     [RAISE_VARARGS] = "RAISE_VARARGS",
@@ -566,46 +559,46 @@ static const char *const _PyOpcode_OpName[256] = {
     [STORE_DEREF] = "STORE_DEREF",
     [DELETE_DEREF] = "DELETE_DEREF",
     [JUMP_BACKWARD] = "JUMP_BACKWARD",
-    [PRECALL_NO_KW_TYPE_1] = "PRECALL_NO_KW_TYPE_1",
+    [RESUME_QUICK] = "RESUME_QUICK",
     [CALL_FUNCTION_EX] = "CALL_FUNCTION_EX",
-    [PRECALL_PYFUNC] = "PRECALL_PYFUNC",
+    [STORE_ATTR_ADAPTIVE] = "STORE_ATTR_ADAPTIVE",
     [EXTENDED_ARG] = "EXTENDED_ARG",
     [LIST_APPEND] = "LIST_APPEND",
     [SET_ADD] = "SET_ADD",
     [MAP_ADD] = "MAP_ADD",
     [LOAD_CLASSDEREF] = "LOAD_CLASSDEREF",
     [COPY_FREE_VARS] = "COPY_FREE_VARS",
-    [RESUME_QUICK] = "RESUME_QUICK",
+    [STORE_ATTR_INSTANCE_VALUE] = "STORE_ATTR_INSTANCE_VALUE",
     [RESUME] = "RESUME",
     [MATCH_CLASS] = "MATCH_CLASS",
-    [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",
     [FORMAT_VALUE] = "FORMAT_VALUE",
     [BUILD_CONST_KEY_MAP] = "BUILD_CONST_KEY_MAP",
     [BUILD_STRING] = "BUILD_STRING",
-    [STORE_ATTR_SLOT] = "STORE_ATTR_SLOT",
-    [STORE_ATTR_WITH_HINT] = "STORE_ATTR_WITH_HINT",
-    [LOAD_METHOD] = "LOAD_METHOD",
     [STORE_FAST__LOAD_FAST] = "STORE_FAST__LOAD_FAST",
+    [STORE_FAST__STORE_FAST] = "STORE_FAST__STORE_FAST",
+    [LOAD_METHOD] = "LOAD_METHOD",
+    [STORE_SUBSCR_ADAPTIVE] = "STORE_SUBSCR_ADAPTIVE",
     [LIST_EXTEND] = "LIST_EXTEND",
     [SET_UPDATE] = "SET_UPDATE",
     [DICT_MERGE] = "DICT_MERGE",
     [DICT_UPDATE] = "DICT_UPDATE",
-    [PRECALL] = "PRECALL",
-    [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",
+    [UNPACK_SEQUENCE_ADAPTIVE] = "UNPACK_SEQUENCE_ADAPTIVE",
+    [UNPACK_SEQUENCE_LIST] = "UNPACK_SEQUENCE_LIST",
+    [UNPACK_SEQUENCE_TUPLE] = "UNPACK_SEQUENCE_TUPLE",
     [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",
-    [UNPACK_SEQUENCE_ADAPTIVE] = "UNPACK_SEQUENCE_ADAPTIVE",
-    [UNPACK_SEQUENCE_LIST] = "UNPACK_SEQUENCE_LIST",
-    [UNPACK_SEQUENCE_TUPLE] = "UNPACK_SEQUENCE_TUPLE",
     [UNPACK_SEQUENCE_TWO_TUPLE] = "UNPACK_SEQUENCE_TWO_TUPLE",
+    [178] = "<178>",
+    [179] = "<179>",
+    [180] = "<180>",
     [181] = "<181>",
     [182] = "<182>",
     [183] = "<183>",
@@ -685,6 +678,9 @@ static const char *const _PyOpcode_OpName[256] = {
 #endif
 
 #define EXTRA_CASES \
+    case 178: \
+    case 179: \
+    case 180: \
     case 181: \
     case 182: \
     case 183: \
diff --git a/Include/opcode.h b/Include/opcode.h
index 084d34b8c73..9a076e01c65 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -112,7 +112,6 @@ extern "C" {
 #define SET_UPDATE                             163
 #define DICT_MERGE                             164
 #define DICT_UPDATE                            165
-#define PRECALL                                166
 #define CALL                                   171
 #define KW_NAMES                               172
 #define POP_JUMP_BACKWARD_IF_NOT_NONE          173
@@ -136,60 +135,58 @@ extern "C" {
 #define CALL_ADAPTIVE                           22
 #define CALL_PY_EXACT_ARGS                      23
 #define CALL_PY_WITH_DEFAULTS                   24
-#define COMPARE_OP_ADAPTIVE                     26
-#define COMPARE_OP_FLOAT_JUMP                   27
-#define COMPARE_OP_INT_JUMP                     28
-#define COMPARE_OP_STR_JUMP                     29
-#define EXTENDED_ARG_QUICK                      34
-#define JUMP_BACKWARD_QUICK                     38
-#define LOAD_ATTR_ADAPTIVE                      39
-#define LOAD_ATTR_INSTANCE_VALUE                40
-#define LOAD_ATTR_MODULE                        41
-#define LOAD_ATTR_SLOT                          42
-#define LOAD_ATTR_WITH_HINT                     43
-#define LOAD_CONST__LOAD_FAST                   44
-#define LOAD_FAST__LOAD_CONST                   45
-#define LOAD_FAST__LOAD_FAST                    46
-#define LOAD_GLOBAL_ADAPTIVE                    47
-#define LOAD_GLOBAL_BUILTIN                     48
-#define LOAD_GLOBAL_MODULE                      55
-#define LOAD_METHOD_ADAPTIVE                    56
-#define LOAD_METHOD_CLASS                       57
-#define LOAD_METHOD_MODULE                      58
-#define LOAD_METHOD_NO_DICT                     59
-#define LOAD_METHOD_WITH_DICT                   62
-#define LOAD_METHOD_WITH_VALUES                 63
-#define PRECALL_ADAPTIVE                        64
-#define PRECALL_BOUND_METHOD                    65
-#define PRECALL_BUILTIN_CLASS                   66
-#define PRECALL_BUILTIN_FAST_WITH_KEYWORDS      67
-#define PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS  72
-#define PRECALL_NO_KW_BUILTIN_FAST              73
-#define PRECALL_NO_KW_BUILTIN_O                 76
-#define PRECALL_NO_KW_ISINSTANCE                77
-#define PRECALL_NO_KW_LEN                       78
-#define PRECALL_NO_KW_LIST_APPEND               79
-#define PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST    80
-#define PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS  81
-#define PRECALL_NO_KW_METHOD_DESCRIPTOR_O      113
-#define PRECALL_NO_KW_STR_1                    121
-#define PRECALL_NO_KW_TUPLE_1                  127
-#define PRECALL_NO_KW_TYPE_1                   141
-#define PRECALL_PYFUNC                         143
-#define RESUME_QUICK                           150
-#define STORE_ATTR_ADAPTIVE                    153
-#define STORE_ATTR_INSTANCE_VALUE              154
-#define STORE_ATTR_SLOT                        158
-#define STORE_ATTR_WITH_HINT                   159
-#define STORE_FAST__LOAD_FAST                  161
-#define STORE_FAST__STORE_FAST                 167
-#define STORE_SUBSCR_ADAPTIVE                  168
-#define STORE_SUBSCR_DICT                      169
-#define STORE_SUBSCR_LIST_INT                  170
-#define UNPACK_SEQUENCE_ADAPTIVE               177
-#define UNPACK_SEQUENCE_LIST                   178
-#define UNPACK_SEQUENCE_TUPLE                  179
-#define UNPACK_SEQUENCE_TWO_TUPLE              180
+#define CALL_BOUND_METHOD_EXACT_ARGS            26
+#define CALL_BUILTIN_CLASS                      27
+#define CALL_BUILTIN_FAST_WITH_KEYWORDS         28
+#define CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS  29
+#define CALL_NO_KW_BUILTIN_FAST                 34
+#define CALL_NO_KW_BUILTIN_O                    38
+#define CALL_NO_KW_ISINSTANCE                   39
+#define CALL_NO_KW_LEN                          40
+#define CALL_NO_KW_LIST_APPEND                  41
+#define CALL_NO_KW_METHOD_DESCRIPTOR_FAST       42
+#define CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS     43
+#define CALL_NO_KW_METHOD_DESCRIPTOR_O          44
+#define CALL_NO_KW_STR_1                        45
+#define CALL_NO_KW_TUPLE_1                      46
+#define CALL_NO_KW_TYPE_1                       47
+#define COMPARE_OP_ADAPTIVE                     48
+#define COMPARE_OP_FLOAT_JUMP                   55
+#define COMPARE_OP_INT_JUMP                     56
+#define COMPARE_OP_STR_JUMP                     57
+#define EXTENDED_ARG_QUICK                      58
+#define JUMP_BACKWARD_QUICK                     59
+#define LOAD_ATTR_ADAPTIVE                      62
+#define LOAD_ATTR_INSTANCE_VALUE                63
+#define LOAD_ATTR_MODULE                        64
+#define LOAD_ATTR_SLOT                          65
+#define LOAD_ATTR_WITH_HINT                     66
+#define LOAD_CONST__LOAD_FAST                   67
+#define LOAD_FAST__LOAD_CONST                   72
+#define LOAD_FAST__LOAD_FAST                    73
+#define LOAD_GLOBAL_ADAPTIVE                    76
+#define LOAD_GLOBAL_BUILTIN                     77
+#define LOAD_GLOBAL_MODULE                      78
+#define LOAD_METHOD_ADAPTIVE                    79
+#define LOAD_METHOD_CLASS                       80
+#define LOAD_METHOD_MODULE                      81
+#define LOAD_METHOD_NO_DICT                    113
+#define LOAD_METHOD_WITH_DICT                  121
+#define LOAD_METHOD_WITH_VALUES                127
+#define RESUME_QUICK                           141
+#define STORE_ATTR_ADAPTIVE                    143
+#define STORE_ATTR_INSTANCE_VALUE              150
+#define STORE_ATTR_SLOT                        153
+#define STORE_ATTR_WITH_HINT                   154
+#define STORE_FAST__LOAD_FAST                  158
+#define STORE_FAST__STORE_FAST                 159
+#define STORE_SUBSCR_ADAPTIVE                  161
+#define STORE_SUBSCR_DICT                      166
+#define STORE_SUBSCR_LIST_INT                  167
+#define UNPACK_SEQUENCE_ADAPTIVE               168
+#define UNPACK_SEQUENCE_LIST                   169
+#define UNPACK_SEQUENCE_TUPLE                  170
+#define UNPACK_SEQUENCE_TWO_TUPLE              177
 #define DO_TRACING                             255
 
 #define HAS_CONST(op) (false\