GH-93429: Merge `LOAD_METHOD` back into `LOAD_ATTR` (GH-93430)

1 files changed, 29 insertions, 32 deletions

diff --git a/Include/opcode.h b/Include/opcode.h
index e7713013cd..04e5bc8310 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -108,7 +108,6 @@ extern "C" {
 #define FORMAT_VALUE                           155
 #define BUILD_CONST_KEY_MAP                    156
 #define BUILD_STRING                           157
-#define LOAD_METHOD                            160
 #define LIST_EXTEND                            162
 #define SET_UPDATE                             163
 #define DICT_MERGE                             164
@@ -158,37 +157,35 @@ extern "C" {
 #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_LAZY_DICT                   81
-#define LOAD_METHOD_MODULE                      86
-#define LOAD_METHOD_NO_DICT                    113
-#define LOAD_METHOD_WITH_DICT                  121
-#define LOAD_METHOD_WITH_VALUES                141
-#define RESUME_QUICK                           143
-#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                 166
-#define STORE_SUBSCR_ADAPTIVE                  167
-#define STORE_SUBSCR_DICT                      168
-#define STORE_SUBSCR_LIST_INT                  169
-#define UNPACK_SEQUENCE_ADAPTIVE               170
-#define UNPACK_SEQUENCE_LIST                   177
-#define UNPACK_SEQUENCE_TUPLE                  178
-#define UNPACK_SEQUENCE_TWO_TUPLE              179
+#define LOAD_ATTR_CLASS                         63
+#define LOAD_ATTR_INSTANCE_VALUE                64
+#define LOAD_ATTR_MODULE                        65
+#define LOAD_ATTR_SLOT                          66
+#define LOAD_ATTR_WITH_HINT                     67
+#define LOAD_ATTR_METHOD_LAZY_DICT              72
+#define LOAD_ATTR_METHOD_NO_DICT                73
+#define LOAD_ATTR_METHOD_WITH_DICT              76
+#define LOAD_ATTR_METHOD_WITH_VALUES            77
+#define LOAD_CONST__LOAD_FAST                   78
+#define LOAD_FAST__LOAD_CONST                   79
+#define LOAD_FAST__LOAD_FAST                    80
+#define LOAD_GLOBAL_ADAPTIVE                    81
+#define LOAD_GLOBAL_BUILTIN                     86
+#define LOAD_GLOBAL_MODULE                     113
+#define RESUME_QUICK                           121
+#define STORE_ATTR_ADAPTIVE                    141
+#define STORE_ATTR_INSTANCE_VALUE              143
+#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                  160
+#define STORE_SUBSCR_DICT                      161
+#define STORE_SUBSCR_LIST_INT                  166
+#define UNPACK_SEQUENCE_ADAPTIVE               167
+#define UNPACK_SEQUENCE_LIST                   168
+#define UNPACK_SEQUENCE_TUPLE                  169
+#define UNPACK_SEQUENCE_TWO_TUPLE              170
 #define DO_TRACING                             255
 
 #define HAS_CONST(op) (false\