Feedback from code review

brandtbucher · Sep 13, 2023 · Aug 11, 2023 · Aug 12, 2023 · Aug 12, 2023 · Sep 5, 2023
commit 21b7fef77782efad37b5febc661b121d788ee520
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
@@ -1122,7 +1122,8 @@ iterations of the loop.
    This bytecode distinguishes two cases: if ``STACK[-1]`` has a method with the
    correct name, the bytecode pushes the unbound method and ``STACK[-1]``.
    ``STACK[-1]`` will be used as the first argument (``self``) by :opcode:`CALL`
-   or :opcode:`CALL_KW` when calling the unbound method. Otherwise, ``NULL`` and the object returned by
+   or :opcode:`CALL_KW` when calling the unbound method.
+   Otherwise, ``NULL`` and the object returned by
    the attribute lookup are pushed.
 
    .. versionchanged:: 3.12
@@ -1394,11 +1395,10 @@ iterations of the loop.
    On the stack are (in ascending order):
 
    * The callable
-   * ``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``.
 
    ``CALL`` pops all arguments and the callable object off the stack,
    calls the callable object with those arguments, and pushes the return value
@@ -1419,13 +1419,13 @@ iterations of the loop.
    including one or more named arguments. On the stack are (in ascending order):
 
    * The callable
-   * ``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``.
+   The length of the tuple of keyword argument names is the number of named arguments.
 
    ``CALL_KW`` pops all arguments, the keyword names, and the callable object
    off the stack, calls the callable object with those arguments, and pushes the

@@ -2894,13 +2894,9 @@ dummy_func(
             CALL_ALLOC_AND_ENTER_INIT,
         };
 
-        // On entry, the stack is either
-        //   [callable, NULL, arg1, arg2, ...]
-        // or
-        //   [callable, self, arg1, arg2, ...]
-        // On exit, the stack is [result].
         // When calling Python, inline the call using DISPATCH_INLINED().
         inst(CALL, (unused/1, unused/2, callable, self_or_null, args[oparg] -- res)) {
+            // oparg counts all of the args, but *not* self:
             int total_args = oparg;
             if (self_or_null != NULL) {
                 args--;
@@ -3514,6 +3510,7 @@ dummy_func(
         }
 
         inst(CALL_KW, (callable, self_or_null, args[oparg], kwnames -- res)) {
+            // oparg counts all of the args, but *not* self:
             int total_args = oparg;
             if (self_or_null != NULL) {
                 args--;

diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h