GH-106008: Make implicit boolean conversions explicit (GH-106003)

3 files changed, 144 insertions, 128 deletions

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 8755cb3..d1829eb 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -101,6 +101,13 @@ typedef struct {
 
 #define INLINE_CACHE_ENTRIES_SEND CACHE_ENTRIES(_PySendCache)
 
+typedef struct {
+    uint16_t counter;
+    uint16_t version[2];
+} _PyToBoolCache;
+
+#define INLINE_CACHE_ENTRIES_TO_BOOL CACHE_ENTRIES(_PyToBoolCache)
+
 // Borrowed references to common callables:
 struct callable_cache {
     PyObject *isinstance;
@@ -246,6 +253,7 @@ extern void _Py_Specialize_UnpackSequence(PyObject *seq, _Py_CODEUNIT *instr,
                                           int oparg);
 extern void _Py_Specialize_ForIter(PyObject *iter, _Py_CODEUNIT *instr, int oparg);
 extern void _Py_Specialize_Send(PyObject *receiver, _Py_CODEUNIT *instr);
+extern void _Py_Specialize_ToBool(PyObject *value, _Py_CODEUNIT *instr);
 
 /* Finalizer function for static codeobjects used in deepfreeze.py */
 extern void _PyStaticCode_Fini(PyCodeObject *co);
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
index bebdedc..428df4c 100644
--- a/Include/internal/pycore_opcode.h
+++ b/Include/internal/pycore_opcode.h
@@ -19,6 +19,7 @@ extern const uint8_t _PyOpcode_Deopt[256];
 #ifdef NEED_OPCODE_TABLES
 
 const uint8_t _PyOpcode_Caches[256] = {
+    [TO_BOOL] = 3,
     [BINARY_SUBSCR] = 1,
     [STORE_SUBSCR] = 1,
     [UNPACK_SEQUENCE] = 1,
@@ -221,6 +222,13 @@ const uint8_t _PyOpcode_Deopt[256] = {
     [STORE_SUBSCR_DICT] = STORE_SUBSCR,
     [STORE_SUBSCR_LIST_INT] = STORE_SUBSCR,
     [SWAP] = SWAP,
+    [TO_BOOL] = TO_BOOL,
+    [TO_BOOL_ALWAYS_TRUE] = TO_BOOL,
+    [TO_BOOL_BOOL] = TO_BOOL,
+    [TO_BOOL_INT] = TO_BOOL,
+    [TO_BOOL_LIST] = TO_BOOL,
+    [TO_BOOL_NONE] = TO_BOOL,
+    [TO_BOOL_STR] = TO_BOOL,
     [UNARY_INVERT] = UNARY_INVERT,
     [UNARY_NEGATIVE] = UNARY_NEGATIVE,
     [UNARY_NOT] = UNARY_NOT,
@@ -242,49 +250,49 @@ static const char *const _PyOpcode_OpName[268] = {
     [INTERPRETER_EXIT] = "INTERPRETER_EXIT",
     [END_FOR] = "END_FOR",
     [END_SEND] = "END_SEND",
-    [BINARY_OP_MULTIPLY_INT] = "BINARY_OP_MULTIPLY_INT",
-    [BINARY_OP_ADD_INT] = "BINARY_OP_ADD_INT",
-    [BINARY_OP_SUBTRACT_INT] = "BINARY_OP_SUBTRACT_INT",
+    [TO_BOOL] = "TO_BOOL",
+    [TO_BOOL_ALWAYS_TRUE] = "TO_BOOL_ALWAYS_TRUE",
+    [TO_BOOL_BOOL] = "TO_BOOL_BOOL",
     [NOP] = "NOP",
-    [BINARY_OP_MULTIPLY_FLOAT] = "BINARY_OP_MULTIPLY_FLOAT",
+    [TO_BOOL_INT] = "TO_BOOL_INT",
     [UNARY_NEGATIVE] = "UNARY_NEGATIVE",
     [UNARY_NOT] = "UNARY_NOT",
-    [BINARY_OP_ADD_FLOAT] = "BINARY_OP_ADD_FLOAT",
-    [BINARY_OP_SUBTRACT_FLOAT] = "BINARY_OP_SUBTRACT_FLOAT",
+    [TO_BOOL_LIST] = "TO_BOOL_LIST",
+    [TO_BOOL_NONE] = "TO_BOOL_NONE",
     [UNARY_INVERT] = "UNARY_INVERT",
     [EXIT_INIT_CHECK] = "EXIT_INIT_CHECK",
     [RESERVED] = "RESERVED",
-    [BINARY_OP_ADD_UNICODE] = "BINARY_OP_ADD_UNICODE",
-    [BINARY_OP_INPLACE_ADD_UNICODE] = "BINARY_OP_INPLACE_ADD_UNICODE",
-    [BINARY_SUBSCR_DICT] = "BINARY_SUBSCR_DICT",
-    [BINARY_SUBSCR_GETITEM] = "BINARY_SUBSCR_GETITEM",
-    [BINARY_SUBSCR_LIST_INT] = "BINARY_SUBSCR_LIST_INT",
-    [BINARY_SUBSCR_TUPLE_INT] = "BINARY_SUBSCR_TUPLE_INT",
+    [TO_BOOL_STR] = "TO_BOOL_STR",
+    [BINARY_OP_MULTIPLY_INT] = "BINARY_OP_MULTIPLY_INT",
+    [BINARY_OP_ADD_INT] = "BINARY_OP_ADD_INT",
+    [BINARY_OP_SUBTRACT_INT] = "BINARY_OP_SUBTRACT_INT",
+    [BINARY_OP_MULTIPLY_FLOAT] = "BINARY_OP_MULTIPLY_FLOAT",
+    [BINARY_OP_ADD_FLOAT] = "BINARY_OP_ADD_FLOAT",
     [MAKE_FUNCTION] = "MAKE_FUNCTION",
     [BINARY_SUBSCR] = "BINARY_SUBSCR",
     [BINARY_SLICE] = "BINARY_SLICE",
     [STORE_SLICE] = "STORE_SLICE",
-    [STORE_SUBSCR_DICT] = "STORE_SUBSCR_DICT",
-    [STORE_SUBSCR_LIST_INT] = "STORE_SUBSCR_LIST_INT",
+    [BINARY_OP_SUBTRACT_FLOAT] = "BINARY_OP_SUBTRACT_FLOAT",
+    [BINARY_OP_ADD_UNICODE] = "BINARY_OP_ADD_UNICODE",
     [GET_LEN] = "GET_LEN",
     [MATCH_MAPPING] = "MATCH_MAPPING",
     [MATCH_SEQUENCE] = "MATCH_SEQUENCE",
     [MATCH_KEYS] = "MATCH_KEYS",
-    [SEND_GEN] = "SEND_GEN",
+    [BINARY_OP_INPLACE_ADD_UNICODE] = "BINARY_OP_INPLACE_ADD_UNICODE",
     [PUSH_EXC_INFO] = "PUSH_EXC_INFO",
     [CHECK_EXC_MATCH] = "CHECK_EXC_MATCH",
     [CHECK_EG_MATCH] = "CHECK_EG_MATCH",
-    [UNPACK_SEQUENCE_TWO_TUPLE] = "UNPACK_SEQUENCE_TWO_TUPLE",
-    [UNPACK_SEQUENCE_TUPLE] = "UNPACK_SEQUENCE_TUPLE",
+    [BINARY_SUBSCR_DICT] = "BINARY_SUBSCR_DICT",
+    [BINARY_SUBSCR_GETITEM] = "BINARY_SUBSCR_GETITEM",
     [FORMAT_SIMPLE] = "FORMAT_SIMPLE",
     [FORMAT_WITH_SPEC] = "FORMAT_WITH_SPEC",
-    [UNPACK_SEQUENCE_LIST] = "UNPACK_SEQUENCE_LIST",
-    [STORE_ATTR_INSTANCE_VALUE] = "STORE_ATTR_INSTANCE_VALUE",
-    [STORE_ATTR_SLOT] = "STORE_ATTR_SLOT",
-    [STORE_ATTR_WITH_HINT] = "STORE_ATTR_WITH_HINT",
-    [LOAD_GLOBAL_MODULE] = "LOAD_GLOBAL_MODULE",
-    [LOAD_GLOBAL_BUILTIN] = "LOAD_GLOBAL_BUILTIN",
-    [LOAD_SUPER_ATTR_ATTR] = "LOAD_SUPER_ATTR_ATTR",
+    [BINARY_SUBSCR_LIST_INT] = "BINARY_SUBSCR_LIST_INT",
+    [BINARY_SUBSCR_TUPLE_INT] = "BINARY_SUBSCR_TUPLE_INT",
+    [STORE_SUBSCR_DICT] = "STORE_SUBSCR_DICT",
+    [STORE_SUBSCR_LIST_INT] = "STORE_SUBSCR_LIST_INT",
+    [SEND_GEN] = "SEND_GEN",
+    [UNPACK_SEQUENCE_TWO_TUPLE] = "UNPACK_SEQUENCE_TWO_TUPLE",
+    [UNPACK_SEQUENCE_TUPLE] = "UNPACK_SEQUENCE_TUPLE",
     [WITH_EXCEPT_START] = "WITH_EXCEPT_START",
     [GET_AITER] = "GET_AITER",
     [GET_ANEXT] = "GET_ANEXT",
@@ -292,39 +300,39 @@ static const char *const _PyOpcode_OpName[268] = {
     [BEFORE_WITH] = "BEFORE_WITH",
     [END_ASYNC_FOR] = "END_ASYNC_FOR",
     [CLEANUP_THROW] = "CLEANUP_THROW",
+    [UNPACK_SEQUENCE_LIST] = "UNPACK_SEQUENCE_LIST",
+    [STORE_ATTR_INSTANCE_VALUE] = "STORE_ATTR_INSTANCE_VALUE",
+    [STORE_ATTR_SLOT] = "STORE_ATTR_SLOT",
+    [STORE_ATTR_WITH_HINT] = "STORE_ATTR_WITH_HINT",
+    [STORE_SUBSCR] = "STORE_SUBSCR",
+    [DELETE_SUBSCR] = "DELETE_SUBSCR",
+    [LOAD_GLOBAL_MODULE] = "LOAD_GLOBAL_MODULE",
+    [LOAD_GLOBAL_BUILTIN] = "LOAD_GLOBAL_BUILTIN",
+    [LOAD_SUPER_ATTR_ATTR] = "LOAD_SUPER_ATTR_ATTR",
     [LOAD_SUPER_ATTR_METHOD] = "LOAD_SUPER_ATTR_METHOD",
     [LOAD_ATTR_INSTANCE_VALUE] = "LOAD_ATTR_INSTANCE_VALUE",
     [LOAD_ATTR_MODULE] = "LOAD_ATTR_MODULE",
+    [GET_ITER] = "GET_ITER",
+    [GET_YIELD_FROM_ITER] = "GET_YIELD_FROM_ITER",
     [LOAD_ATTR_WITH_HINT] = "LOAD_ATTR_WITH_HINT",
-    [STORE_SUBSCR] = "STORE_SUBSCR",
-    [DELETE_SUBSCR] = "DELETE_SUBSCR",
+    [LOAD_BUILD_CLASS] = "LOAD_BUILD_CLASS",
     [LOAD_ATTR_SLOT] = "LOAD_ATTR_SLOT",
     [LOAD_ATTR_CLASS] = "LOAD_ATTR_CLASS",
+    [LOAD_ASSERTION_ERROR] = "LOAD_ASSERTION_ERROR",
+    [RETURN_GENERATOR] = "RETURN_GENERATOR",
     [LOAD_ATTR_PROPERTY] = "LOAD_ATTR_PROPERTY",
     [LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN] = "LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN",
     [LOAD_ATTR_METHOD_WITH_VALUES] = "LOAD_ATTR_METHOD_WITH_VALUES",
     [LOAD_ATTR_METHOD_NO_DICT] = "LOAD_ATTR_METHOD_NO_DICT",
-    [GET_ITER] = "GET_ITER",
-    [GET_YIELD_FROM_ITER] = "GET_YIELD_FROM_ITER",
     [LOAD_ATTR_METHOD_LAZY_DICT] = "LOAD_ATTR_METHOD_LAZY_DICT",
-    [LOAD_BUILD_CLASS] = "LOAD_BUILD_CLASS",
     [COMPARE_OP_FLOAT] = "COMPARE_OP_FLOAT",
     [COMPARE_OP_INT] = "COMPARE_OP_INT",
-    [LOAD_ASSERTION_ERROR] = "LOAD_ASSERTION_ERROR",
-    [RETURN_GENERATOR] = "RETURN_GENERATOR",
-    [COMPARE_OP_STR] = "COMPARE_OP_STR",
-    [FOR_ITER_LIST] = "FOR_ITER_LIST",
-    [FOR_ITER_TUPLE] = "FOR_ITER_TUPLE",
-    [FOR_ITER_RANGE] = "FOR_ITER_RANGE",
-    [FOR_ITER_GEN] = "FOR_ITER_GEN",
-    [CALL_BOUND_METHOD_EXACT_ARGS] = "CALL_BOUND_METHOD_EXACT_ARGS",
-    [CALL_PY_EXACT_ARGS] = "CALL_PY_EXACT_ARGS",
     [RETURN_VALUE] = "RETURN_VALUE",
-    [CALL_PY_WITH_DEFAULTS] = "CALL_PY_WITH_DEFAULTS",
+    [COMPARE_OP_STR] = "COMPARE_OP_STR",
     [SETUP_ANNOTATIONS] = "SETUP_ANNOTATIONS",
-    [CALL_NO_KW_TYPE_1] = "CALL_NO_KW_TYPE_1",
+    [FOR_ITER_LIST] = "FOR_ITER_LIST",
     [LOAD_LOCALS] = "LOAD_LOCALS",
-    [CALL_NO_KW_STR_1] = "CALL_NO_KW_STR_1",
+    [FOR_ITER_TUPLE] = "FOR_ITER_TUPLE",
     [POP_EXCEPT] = "POP_EXCEPT",
     [STORE_NAME] = "STORE_NAME",
     [DELETE_NAME] = "DELETE_NAME",
@@ -347,9 +355,9 @@ static const char *const _PyOpcode_OpName[268] = {
     [IMPORT_NAME] = "IMPORT_NAME",
     [IMPORT_FROM] = "IMPORT_FROM",
     [JUMP_FORWARD] = "JUMP_FORWARD",
-    [CALL_NO_KW_TUPLE_1] = "CALL_NO_KW_TUPLE_1",
-    [CALL_BUILTIN_CLASS] = "CALL_BUILTIN_CLASS",
-    [CALL_NO_KW_BUILTIN_O] = "CALL_NO_KW_BUILTIN_O",
+    [FOR_ITER_RANGE] = "FOR_ITER_RANGE",
+    [FOR_ITER_GEN] = "FOR_ITER_GEN",
+    [CALL_BOUND_METHOD_EXACT_ARGS] = "CALL_BOUND_METHOD_EXACT_ARGS",
     [POP_JUMP_IF_FALSE] = "POP_JUMP_IF_FALSE",
     [POP_JUMP_IF_TRUE] = "POP_JUMP_IF_TRUE",
     [LOAD_GLOBAL] = "LOAD_GLOBAL",
@@ -368,11 +376,11 @@ static const char *const _PyOpcode_OpName[268] = {
     [POP_JUMP_IF_NONE] = "POP_JUMP_IF_NONE",
     [RAISE_VARARGS] = "RAISE_VARARGS",
     [GET_AWAITABLE] = "GET_AWAITABLE",
-    [CALL_NO_KW_BUILTIN_FAST] = "CALL_NO_KW_BUILTIN_FAST",
+    [CALL_PY_EXACT_ARGS] = "CALL_PY_EXACT_ARGS",
     [BUILD_SLICE] = "BUILD_SLICE",
     [JUMP_BACKWARD_NO_INTERRUPT] = "JUMP_BACKWARD_NO_INTERRUPT",
     [MAKE_CELL] = "MAKE_CELL",
-    [CALL_BUILTIN_FAST_WITH_KEYWORDS] = "CALL_BUILTIN_FAST_WITH_KEYWORDS",
+    [CALL_PY_WITH_DEFAULTS] = "CALL_PY_WITH_DEFAULTS",
     [LOAD_DEREF] = "LOAD_DEREF",
     [STORE_DEREF] = "STORE_DEREF",
     [DELETE_DEREF] = "DELETE_DEREF",
@@ -384,26 +392,26 @@ static const char *const _PyOpcode_OpName[268] = {
     [LIST_APPEND] = "LIST_APPEND",
     [SET_ADD] = "SET_ADD",
     [MAP_ADD] = "MAP_ADD",
-    [CALL_NO_KW_LEN] = "CALL_NO_KW_LEN",
+    [CALL_NO_KW_TYPE_1] = "CALL_NO_KW_TYPE_1",
     [COPY_FREE_VARS] = "COPY_FREE_VARS",
     [YIELD_VALUE] = "YIELD_VALUE",
     [RESUME] = "RESUME",
     [MATCH_CLASS] = "MATCH_CLASS",
-    [CALL_NO_KW_ISINSTANCE] = "CALL_NO_KW_ISINSTANCE",
-    [CALL_NO_KW_LIST_APPEND] = "CALL_NO_KW_LIST_APPEND",
-    [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_BUILTIN_CLASS] = "CALL_BUILTIN_CLASS",
     [BUILD_CONST_KEY_MAP] = "BUILD_CONST_KEY_MAP",
     [BUILD_STRING] = "BUILD_STRING",
     [CONVERT_VALUE] = "CONVERT_VALUE",
-    [CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = "CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS",
-    [CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = "CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS",
-    [CALL_NO_KW_METHOD_DESCRIPTOR_FAST] = "CALL_NO_KW_METHOD_DESCRIPTOR_FAST",
+    [CALL_NO_KW_BUILTIN_O] = "CALL_NO_KW_BUILTIN_O",
+    [CALL_NO_KW_BUILTIN_FAST] = "CALL_NO_KW_BUILTIN_FAST",
+    [CALL_BUILTIN_FAST_WITH_KEYWORDS] = "CALL_BUILTIN_FAST_WITH_KEYWORDS",
     [LIST_EXTEND] = "LIST_EXTEND",
     [SET_UPDATE] = "SET_UPDATE",
     [DICT_MERGE] = "DICT_MERGE",
     [DICT_UPDATE] = "DICT_UPDATE",
-    [CALL_NO_KW_ALLOC_AND_ENTER_INIT] = "CALL_NO_KW_ALLOC_AND_ENTER_INIT",
-    [167] = "<167>",
+    [CALL_NO_KW_LEN] = "CALL_NO_KW_LEN",
+    [CALL_NO_KW_ISINSTANCE] = "CALL_NO_KW_ISINSTANCE",
     [LOAD_FAST_LOAD_FAST] = "LOAD_FAST_LOAD_FAST",
     [STORE_FAST_LOAD_FAST] = "STORE_FAST_LOAD_FAST",
     [STORE_FAST_STORE_FAST] = "STORE_FAST_STORE_FAST",
@@ -414,12 +422,12 @@ static const char *const _PyOpcode_OpName[268] = {
     [LOAD_FROM_DICT_OR_GLOBALS] = "LOAD_FROM_DICT_OR_GLOBALS",
     [LOAD_FROM_DICT_OR_DEREF] = "LOAD_FROM_DICT_OR_DEREF",
     [SET_FUNCTION_ATTRIBUTE] = "SET_FUNCTION_ATTRIBUTE",
-    [178] = "<178>",
-    [179] = "<179>",
-    [180] = "<180>",
-    [181] = "<181>",
-    [182] = "<182>",
-    [183] = "<183>",
+    [CALL_NO_KW_LIST_APPEND] = "CALL_NO_KW_LIST_APPEND",
+    [CALL_NO_KW_METHOD_DESCRIPTOR_O] = "CALL_NO_KW_METHOD_DESCRIPTOR_O",
+    [CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = "CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS",
+    [CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = "CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS",
+    [CALL_NO_KW_METHOD_DESCRIPTOR_FAST] = "CALL_NO_KW_METHOD_DESCRIPTOR_FAST",
+    [CALL_NO_KW_ALLOC_AND_ENTER_INIT] = "CALL_NO_KW_ALLOC_AND_ENTER_INIT",
     [184] = "<184>",
     [185] = "<185>",
     [186] = "<186>",
@@ -508,13 +516,6 @@ static const char *const _PyOpcode_OpName[268] = {
 #endif
 
 #define EXTRA_CASES \
-    case 167: \
-    case 178: \
-    case 179: \
-    case 180: \
-    case 181: \
-    case 182: \
-    case 183: \
     case 184: \
     case 185: \
     case 186: \
diff --git a/Include/opcode.h b/Include/opcode.h
index 0533ae9..6b855bd 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -14,6 +14,7 @@ extern "C" {
 #define INTERPRETER_EXIT                         3
 #define END_FOR                                  4
 #define END_SEND                                 5
+#define TO_BOOL                                  6
 #define NOP                                      9
 #define UNARY_NEGATIVE                          11
 #define UNARY_NOT                               12
@@ -159,66 +160,72 @@ extern "C" {
 #define STORE_FAST_MAYBE_NULL                  266
 #define LOAD_CLOSURE                           267
 #define MAX_PSEUDO_OPCODE                      267
-#define BINARY_OP_MULTIPLY_INT                   6
-#define BINARY_OP_ADD_INT                        7
-#define BINARY_OP_SUBTRACT_INT                   8
-#define BINARY_OP_MULTIPLY_FLOAT                10
-#define BINARY_OP_ADD_FLOAT                     13
-#define BINARY_OP_SUBTRACT_FLOAT                14
-#define BINARY_OP_ADD_UNICODE                   18
-#define BINARY_OP_INPLACE_ADD_UNICODE           19
-#define BINARY_SUBSCR_DICT                      20
-#define BINARY_SUBSCR_GETITEM                   21
-#define BINARY_SUBSCR_LIST_INT                  22
-#define BINARY_SUBSCR_TUPLE_INT                 23
-#define STORE_SUBSCR_DICT                       28
-#define STORE_SUBSCR_LIST_INT                   29
-#define SEND_GEN                                34
-#define UNPACK_SEQUENCE_TWO_TUPLE               38
-#define UNPACK_SEQUENCE_TUPLE                   39
-#define UNPACK_SEQUENCE_LIST                    42
-#define STORE_ATTR_INSTANCE_VALUE               43
-#define STORE_ATTR_SLOT                         44
-#define STORE_ATTR_WITH_HINT                    45
-#define LOAD_GLOBAL_MODULE                      46
-#define LOAD_GLOBAL_BUILTIN                     47
-#define LOAD_SUPER_ATTR_ATTR                    48
-#define LOAD_SUPER_ATTR_METHOD                  56
-#define LOAD_ATTR_INSTANCE_VALUE                57
-#define LOAD_ATTR_MODULE                        58
-#define LOAD_ATTR_WITH_HINT                     59
-#define LOAD_ATTR_SLOT                          62
-#define LOAD_ATTR_CLASS                         63
-#define LOAD_ATTR_PROPERTY                      64
-#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN       65
-#define LOAD_ATTR_METHOD_WITH_VALUES            66
-#define LOAD_ATTR_METHOD_NO_DICT                67
-#define LOAD_ATTR_METHOD_LAZY_DICT              70
-#define COMPARE_OP_FLOAT                        72
-#define COMPARE_OP_INT                          73
-#define COMPARE_OP_STR                          76
-#define FOR_ITER_LIST                           77
-#define FOR_ITER_TUPLE                          78
-#define FOR_ITER_RANGE                          79
-#define FOR_ITER_GEN                            80
-#define CALL_BOUND_METHOD_EXACT_ARGS            81
-#define CALL_PY_EXACT_ARGS                      82
-#define CALL_PY_WITH_DEFAULTS                   84
-#define CALL_NO_KW_TYPE_1                       86
-#define CALL_NO_KW_STR_1                        88
-#define CALL_NO_KW_TUPLE_1                     111
-#define CALL_BUILTIN_CLASS                     112
-#define CALL_NO_KW_BUILTIN_O                   113
-#define CALL_NO_KW_BUILTIN_FAST                132
-#define CALL_BUILTIN_FAST_WITH_KEYWORDS        136
-#define CALL_NO_KW_LEN                         148
-#define CALL_NO_KW_ISINSTANCE                  153
-#define CALL_NO_KW_LIST_APPEND                 154
-#define CALL_NO_KW_METHOD_DESCRIPTOR_O         155
-#define CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 159
-#define CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS    160
-#define CALL_NO_KW_METHOD_DESCRIPTOR_FAST      161
-#define CALL_NO_KW_ALLOC_AND_ENTER_INIT        166
+#define TO_BOOL_ALWAYS_TRUE                      7
+#define TO_BOOL_BOOL                             8
+#define TO_BOOL_INT                             10
+#define TO_BOOL_LIST                            13
+#define TO_BOOL_NONE                            14
+#define TO_BOOL_STR                             18
+#define BINARY_OP_MULTIPLY_INT                  19
+#define BINARY_OP_ADD_INT                       20
+#define BINARY_OP_SUBTRACT_INT                  21
+#define BINARY_OP_MULTIPLY_FLOAT                22
+#define BINARY_OP_ADD_FLOAT                     23
+#define BINARY_OP_SUBTRACT_FLOAT                28
+#define BINARY_OP_ADD_UNICODE                   29
+#define BINARY_OP_INPLACE_ADD_UNICODE           34
+#define BINARY_SUBSCR_DICT                      38
+#define BINARY_SUBSCR_GETITEM                   39
+#define BINARY_SUBSCR_LIST_INT                  42
+#define BINARY_SUBSCR_TUPLE_INT                 43
+#define STORE_SUBSCR_DICT                       44
+#define STORE_SUBSCR_LIST_INT                   45
+#define SEND_GEN                                46
+#define UNPACK_SEQUENCE_TWO_TUPLE               47
+#define UNPACK_SEQUENCE_TUPLE                   48
+#define UNPACK_SEQUENCE_LIST                    56
+#define STORE_ATTR_INSTANCE_VALUE               57
+#define STORE_ATTR_SLOT                         58
+#define STORE_ATTR_WITH_HINT                    59
+#define LOAD_GLOBAL_MODULE                      62
+#define LOAD_GLOBAL_BUILTIN                     63
+#define LOAD_SUPER_ATTR_ATTR                    64
+#define LOAD_SUPER_ATTR_METHOD                  65
+#define LOAD_ATTR_INSTANCE_VALUE                66
+#define LOAD_ATTR_MODULE                        67
+#define LOAD_ATTR_WITH_HINT                     70
+#define LOAD_ATTR_SLOT                          72
+#define LOAD_ATTR_CLASS                         73
+#define LOAD_ATTR_PROPERTY                      76
+#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN       77
+#define LOAD_ATTR_METHOD_WITH_VALUES            78
+#define LOAD_ATTR_METHOD_NO_DICT                79
+#define LOAD_ATTR_METHOD_LAZY_DICT              80
+#define COMPARE_OP_FLOAT                        81
+#define COMPARE_OP_INT                          82
+#define COMPARE_OP_STR                          84
+#define FOR_ITER_LIST                           86
+#define FOR_ITER_TUPLE                          88
+#define FOR_ITER_RANGE                         111
+#define FOR_ITER_GEN                           112
+#define CALL_BOUND_METHOD_EXACT_ARGS           113
+#define CALL_PY_EXACT_ARGS                     132
+#define CALL_PY_WITH_DEFAULTS                  136
+#define CALL_NO_KW_TYPE_1                      148
+#define CALL_NO_KW_STR_1                       153
+#define CALL_NO_KW_TUPLE_1                     154
+#define CALL_BUILTIN_CLASS                     155
+#define CALL_NO_KW_BUILTIN_O                   159
+#define CALL_NO_KW_BUILTIN_FAST                160
+#define CALL_BUILTIN_FAST_WITH_KEYWORDS        161
+#define CALL_NO_KW_LEN                         166
+#define CALL_NO_KW_ISINSTANCE                  167
+#define CALL_NO_KW_LIST_APPEND                 178
+#define CALL_NO_KW_METHOD_DESCRIPTOR_O         179
+#define CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 180
+#define CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS    181
+#define CALL_NO_KW_METHOD_DESCRIPTOR_FAST      182
+#define CALL_NO_KW_ALLOC_AND_ENTER_INIT        183
 
 #define NB_ADD                                   0
 #define NB_AND                                   1