Split things up (sorta)

python · brandtbucher · Sep 13, 2023 · Aug 11, 2023 · Aug 12, 2023 · Aug 12, 2023
commit 5e435449bccdd61882c7ea329dade478673dc473
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
@@ -1390,10 +1390,38 @@ iterations of the loop.
 
 .. opcode:: CALL (argc)
 
+   Calls a callable object with the number of arguments specified by ``argc``.
+   On the stack are (in ascending order):
+
+   * NULL
+   * The callable
+   * The positional arguments
+   * The named arguments
+
+   or:
+
+   * The callable
+   * ``self`` (or ``NULL``)
-   * ``self`` (or ``NULL``)
+   * ``self`` or ``NULL``
-   * ``self`` (or ``NULL``)
+   * ``self`` or ``NULL``
+   * The remaining positional arguments
+
+   ``argc`` is the total of the positional arguments, excluding
+   ``self`` when a ``NULL`` is not present.
-   ``argc`` is the total of the positional arguments, excluding
-   ``self`` when a ``NULL`` is not present.
+   ``argc`` is the total of the positional arguments, excluding ``self``.
-   ``argc`` is the total of the positional arguments, excluding
-   ``self`` when a ``NULL`` is not present.
+   ``argc`` is the total of the positional arguments, excluding ``self``.
+
+   ``CALL`` pops all arguments and the callable object off the stack,
+   calls the callable object with those arguments, and pushes the return value
+   returned by the callable object.
+
+   .. versionadded:: 3.11
+
+   .. versionchanged:: 3.13
+      Calls with keyword arguments are now handled by :opcode:`CALL_KW`.
+
+
+.. opcode:: CALL_KW (argc)
+
    Calls a callable object with the number of arguments specified by ``argc``,
-   including the named arguments specified by the preceding
-   :opcode:`KW_NAMES`, if any.
-   On the stack are (in ascending order), either:
+   including one or more named arguments.
+   On the stack are (in ascending order):
 
    * NULL
    * The callable
@@ -1403,18 +1431,19 @@ iterations of the loop.
    or:
 
    * The callable
-   * ``self``
+   * ``self`` (or ``NULL``)
-   * ``self`` (or ``NULL``)
+   * ``self`` or ``NULL``
-   * ``self`` (or ``NULL``)
+   * ``self`` or ``NULL``
    * The remaining positional arguments
    * The named arguments
+   * A :class:`tuple` of keyword argument names
 
    ``argc`` is the total of the positional and named arguments, excluding
    ``self`` when a ``NULL`` is not present.
-   ``argc`` is the total of the positional and named arguments, excluding
-   ``self`` when a ``NULL`` is not present.
+   ``argc`` is the total of the positional and named arguments, excluding ``self``.
-   ``argc`` is the total of the positional and named arguments, excluding
-   ``self`` when a ``NULL`` is not present.
+   ``argc`` is the total of the positional and named arguments, excluding ``self``.
 
-   ``CALL`` pops all arguments and the callable object off the stack,
+   ``CALL`` pops all arguments, the keyword names, and the callable object off the stack,
    calls the callable object with those arguments, and pushes the return value
    returned by the callable object.
 
-   .. versionadded:: 3.11
+   .. versionadded:: 3.13
 
 
 .. opcode:: CALL_FUNCTION_EX (flags)
@@ -1441,15 +1470,6 @@ iterations of the loop.
    .. versionadded:: 3.11
 
 
-.. opcode:: KW_NAMES (consti)
-
-   Prefixes :opcode:`CALL`.
-   Stores a reference to ``co_consts[consti]`` into an internal variable
-   for use by :opcode:`CALL`. ``co_consts[consti]`` must be a tuple of strings.
-
-   .. versionadded:: 3.11
-
-
 .. opcode:: MAKE_FUNCTION
 
    Pushes a new function object on the stack built from the code object at ``STACK[1]``.

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
@@ -250,7 +250,9 @@ extern void _Py_Specialize_BinarySubscr(PyObject *sub, PyObject *container,
 extern void _Py_Specialize_StoreSubscr(PyObject *container, PyObject *sub,
                                        _Py_CODEUNIT *instr);
 extern void _Py_Specialize_Call(PyObject *callable, _Py_CODEUNIT *instr,
-                                int nargs, PyObject *kwnames);
+                                int nargs);
+extern void _Py_Specialize_CallKw(PyObject *callable, _Py_CODEUNIT *instr,
+                                  int nargs, PyObject *kwnames);
 extern void _Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr,
                                     int oparg, PyObject **locals);
 extern void _Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs,

diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
diff --git a/Include/opcode_ids.h b/Include/opcode_ids.h