Modernize CALL_NO_KW_BUILTIN_O

python · gvanrossum · Feb 8, 2023 · Feb 3, 2023 · Feb 3, 2023 · Feb 1, 2023
commit 05e4ea8b5753f9eb0486b8101caf2ec386f68823
@@ -2363,7 +2363,7 @@ dummy_func(
            CALL_NO_KW_STR_1,
            CALL_NO_KW_TUPLE_1,
            CALL_BUILTIN_CLASS,
-        //     CALL_NO_KW_BUILTIN_O,
+            CALL_NO_KW_BUILTIN_O,
        //     CALL_NO_KW_BUILTIN_FAST,
        //     CALL_BUILTIN_FAST_WITH_KEYWORDS,
        //     CALL_NO_KW_LEN,
@@ -2601,15 +2601,16 @@ dummy_func(
            CHECK_EVAL_BREAKER();
        }

-        // stack effect: (__0, __array[oparg] -- )
-        inst(CALL_NO_KW_BUILTIN_O) {
+        inst(CALL_NO_KW_BUILTIN_O, (unused/1, unused/2, unused/1, method, callable, args[oparg] -- res)) {
            assert(cframe.use_tracing == 0);
            /* Builtin METH_O functions */
            assert(kwnames == NULL);
-            int is_meth = is_method(stack_pointer, oparg);
+            int is_meth = method != NULL;
            int total_args = oparg + is_meth;
            DEOPT_IF(total_args != 1, CALL);
-            PyObject *callable = PEEK(total_args + 1);
+            if (is_meth) {
+                callable = method;
+            }
            DEOPT_IF(!PyCFunction_CheckExact(callable), CALL);
            DEOPT_IF(PyCFunction_GET_FLAGS(callable) != METH_O, CALL);
            STAT_INC(CALL, hit);
@@ -2619,19 +2620,14 @@ dummy_func(
            if (_Py_EnterRecursiveCallTstate(tstate, " while calling a Python object")) {
                goto error;
            }
-            PyObject *arg = TOP();
-            PyObject *res = _PyCFunction_TrampolineCall(cfunc, PyCFunction_GET_SELF(callable), arg);
+            PyObject *arg = args[-is_meth];
+            res = _PyCFunction_TrampolineCall(cfunc, PyCFunction_GET_SELF(callable), arg);
            _Py_LeaveRecursiveCallTstate(tstate);
            assert((res != NULL) ^ (_PyErr_Occurred(tstate) != NULL));

            Py_DECREF(arg);
            Py_DECREF(callable);
-            STACK_SHRINK(2-is_meth);
-            SET_TOP(res);
-            if (res == NULL) {
-                goto error;
-            }
-            JUMPBY(INLINE_CACHE_ENTRIES_CALL);
+            ERROR_IF(res == NULL, error);
            CHECK_EVAL_BREAKER();
        }


diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
@@ -303,7 +303,7 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
        case CALL_BUILTIN_CLASS:
            return oparg + 2;
        case CALL_NO_KW_BUILTIN_O:
-            return -1;
+            return oparg + 2;
        case CALL_NO_KW_BUILTIN_FAST:
            return -1;
        case CALL_BUILTIN_FAST_WITH_KEYWORDS:
@@ -649,7 +649,7 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
        case CALL_BUILTIN_CLASS:
            return 1;
        case CALL_NO_KW_BUILTIN_O:
-            return -1;
+            return 1;
        case CALL_NO_KW_BUILTIN_FAST:
            return -1;
        case CALL_BUILTIN_FAST_WITH_KEYWORDS:
@@ -850,7 +850,7 @@ struct opcode_metadata {
    [CALL_NO_KW_STR_1] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBC000 },
    [CALL_NO_KW_TUPLE_1] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBC000 },
    [CALL_BUILTIN_CLASS] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBC000 },
-    [CALL_NO_KW_BUILTIN_O] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
+    [CALL_NO_KW_BUILTIN_O] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBC000 },
    [CALL_NO_KW_BUILTIN_FAST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
    [CALL_BUILTIN_FAST_WITH_KEYWORDS] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
    [CALL_NO_KW_LEN] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },