Modernize CALL_BOUND_METHOD_EXACT_ARGS

Author: gvanrossum

Python/bytecodes.c

@@ -2469,17 +2469,18 @@ dummy_func(
             CHECK_EVAL_BREAKER();
         }
 
-        // stack effect: (__0, __array[oparg] -- )
-        inst(CALL_BOUND_METHOD_EXACT_ARGS) {
-            DEOPT_IF(is_method(stack_pointer, oparg), CALL);
-            PyObject *function = PEEK(oparg + 1);
-            DEOPT_IF(Py_TYPE(function) != &PyMethod_Type, CALL);
+        // Start out with [NULL, method, arg1, arg2, ...]
+        // Transform to [func, self, arg1, arg2, ...]
+        // Then fall through to CALL_PY_EXACT_ARGS
+        inst(CALL_BOUND_METHOD_EXACT_ARGS, (unused/1, unused/2, unused/1, thing1, thing2, unused[oparg] -- unused)) {
+            DEOPT_IF(thing1 != NULL, CALL);
+            DEOPT_IF(Py_TYPE(thing2) != &PyMethod_Type, CALL);
             STAT_INC(CALL, hit);
-            PyObject *self = ((PyMethodObject *)function)->im_self;
-            PEEK(oparg + 1) = Py_NewRef(self);
-            PyObject *meth = ((PyMethodObject *)function)->im_func;
-            PEEK(oparg + 2) = Py_NewRef(meth);
-            Py_DECREF(function);
+            PyObject *self = ((PyMethodObject *)thing2)->im_self;
+            PEEK(oparg + 1) = Py_NewRef(self);  // thing2
+            PyObject *meth = ((PyMethodObject *)thing2)->im_func;
+            PEEK(oparg + 2) = Py_NewRef(meth);  // thing1
+            Py_DECREF(thing2);
             GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
         }
 

Python/generated_cases.c.h

@@ -289,7 +289,7 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
         case CALL:
             return -1;
         case CALL_BOUND_METHOD_EXACT_ARGS:
-            return -1;
+            return oparg + 2;
         case CALL_PY_EXACT_ARGS:
             return -1;
         case CALL_PY_WITH_DEFAULTS:
@@ -635,7 +635,7 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
         case CALL:
             return -1;
         case CALL_BOUND_METHOD_EXACT_ARGS:
-            return -1;
+            return 1;
         case CALL_PY_EXACT_ARGS:
             return -1;
         case CALL_PY_WITH_DEFAULTS:
@@ -843,7 +843,7 @@ struct opcode_metadata {
     [LOAD_ATTR_METHOD_LAZY_DICT] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBC00000000 },
     [KW_NAMES] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
     [CALL] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
-    [CALL_BOUND_METHOD_EXACT_ARGS] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
+    [CALL_BOUND_METHOD_EXACT_ARGS] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBC000 },
     [CALL_PY_EXACT_ARGS] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
     [CALL_PY_WITH_DEFAULTS] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
     [CALL_NO_KW_TYPE_1] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },