bpo-46202: Remove opcode POP_EXCEPT_AND_RERAISE (GH-30302)

* bpo-46202: remove opcode POP_EXCEPT_AND_RERAISE

* do not assume that an exception group is truthy

1 files changed, 36 insertions, 37 deletions

diff --git a/Include/opcode.h b/Include/opcode.h
index 0556526..ef334de 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -24,7 +24,6 @@ extern "C" {
 #define MATCH_SEQUENCE                   32
 #define MATCH_KEYS                       33
 #define PUSH_EXC_INFO                    35
-#define POP_EXCEPT_AND_RERAISE           37
 #define WITH_EXCEPT_START                49
 #define GET_AITER                        50
 #define GET_ANEXT                        51
@@ -132,42 +131,42 @@ extern "C" {
 #define BINARY_SUBSCR_TUPLE_INT          29
 #define BINARY_SUBSCR_DICT               34
 #define STORE_SUBSCR_ADAPTIVE            36
-#define STORE_SUBSCR_LIST_INT            38
-#define STORE_SUBSCR_DICT                39
-#define CALL_NO_KW_ADAPTIVE              40
-#define CALL_NO_KW_BUILTIN_O             41
-#define CALL_NO_KW_BUILTIN_FAST          42
-#define CALL_NO_KW_LEN                   43
-#define CALL_NO_KW_ISINSTANCE            44
-#define CALL_NO_KW_PY_SIMPLE             45
-#define CALL_NO_KW_LIST_APPEND           46
-#define CALL_NO_KW_METHOD_DESCRIPTOR_O   47
-#define CALL_NO_KW_TYPE_1                48
-#define CALL_NO_KW_BUILTIN_CLASS_1       55
-#define CALL_NO_KW_METHOD_DESCRIPTOR_FAST  56
-#define JUMP_ABSOLUTE_QUICK              57
-#define LOAD_ATTR_ADAPTIVE               58
-#define LOAD_ATTR_INSTANCE_VALUE         59
-#define LOAD_ATTR_WITH_HINT              62
-#define LOAD_ATTR_SLOT                   63
-#define LOAD_ATTR_MODULE                 64
-#define LOAD_GLOBAL_ADAPTIVE             65
-#define LOAD_GLOBAL_MODULE               66
-#define LOAD_GLOBAL_BUILTIN              67
-#define LOAD_METHOD_ADAPTIVE             72
-#define LOAD_METHOD_CACHED               75
-#define LOAD_METHOD_CLASS                76
-#define LOAD_METHOD_MODULE               77
-#define LOAD_METHOD_NO_DICT              78
-#define STORE_ATTR_ADAPTIVE              79
-#define STORE_ATTR_INSTANCE_VALUE        80
-#define STORE_ATTR_SLOT                  81
-#define STORE_ATTR_WITH_HINT             87
-#define LOAD_FAST__LOAD_FAST            128
-#define STORE_FAST__LOAD_FAST           131
-#define LOAD_FAST__LOAD_CONST           134
-#define LOAD_CONST__LOAD_FAST           140
-#define STORE_FAST__STORE_FAST          141
+#define STORE_SUBSCR_LIST_INT            37
+#define STORE_SUBSCR_DICT                38
+#define CALL_NO_KW_ADAPTIVE              39
+#define CALL_NO_KW_BUILTIN_O             40
+#define CALL_NO_KW_BUILTIN_FAST          41
+#define CALL_NO_KW_LEN                   42
+#define CALL_NO_KW_ISINSTANCE            43
+#define CALL_NO_KW_PY_SIMPLE             44
+#define CALL_NO_KW_LIST_APPEND           45
+#define CALL_NO_KW_METHOD_DESCRIPTOR_O   46
+#define CALL_NO_KW_TYPE_1                47
+#define CALL_NO_KW_BUILTIN_CLASS_1       48
+#define CALL_NO_KW_METHOD_DESCRIPTOR_FAST  55
+#define JUMP_ABSOLUTE_QUICK              56
+#define LOAD_ATTR_ADAPTIVE               57
+#define LOAD_ATTR_INSTANCE_VALUE         58
+#define LOAD_ATTR_WITH_HINT              59
+#define LOAD_ATTR_SLOT                   62
+#define LOAD_ATTR_MODULE                 63
+#define LOAD_GLOBAL_ADAPTIVE             64
+#define LOAD_GLOBAL_MODULE               65
+#define LOAD_GLOBAL_BUILTIN              66
+#define LOAD_METHOD_ADAPTIVE             67
+#define LOAD_METHOD_CACHED               72
+#define LOAD_METHOD_CLASS                75
+#define LOAD_METHOD_MODULE               76
+#define LOAD_METHOD_NO_DICT              77
+#define STORE_ATTR_ADAPTIVE              78
+#define STORE_ATTR_INSTANCE_VALUE        79
+#define STORE_ATTR_SLOT                  80
+#define STORE_ATTR_WITH_HINT             81
+#define LOAD_FAST__LOAD_FAST             87
+#define STORE_FAST__LOAD_FAST           128
+#define LOAD_FAST__LOAD_CONST           131
+#define LOAD_CONST__LOAD_FAST           134
+#define STORE_FAST__STORE_FAST          140
 #define DO_TRACING                      255
 #ifdef NEED_OPCODE_JUMP_TABLES
 static uint32_t _PyOpcode_RelativeJump[8] = {