simplify oparg & 2 handling

python · carljm · Apr 24, 2023 · Apr 10, 2023 · Apr 13, 2023 · Apr 13, 2023
commit e4466a7a0e16393c6bf0c0d2ed7ae03cb0d8b0e1
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
@@ -1048,8 +1048,8 @@ iterations of the loop.
    The low bit of ``namei`` signals to attempt a method load, as with
    :opcode:`LOAD_ATTR`.
 
-   The second-low bit of ``namei``, if set, means that this was a zero-argument
-   call to :func:`super`.
+   The second-low bit of ``namei``, if set, means that this was a two-argument
+   call to :func:`super` (unset means zero-argument).
 
    .. versionadded:: 3.12
 

@@ -1574,13 +1574,8 @@ dummy_func(
                     Py_DECREF(self);
                 }
             } else {
-                PyObject *super;
-                if (oparg & 2) {
-                    super = PyObject_CallNoArgs(global_super);
-                } else {
-                    PyObject *stack[] = {class, self};
-                    super = PyObject_Vectorcall(global_super, stack, 2, NULL);
-                }
+                PyObject *stack[] = {class, self};
+                PyObject *super = PyObject_Vectorcall(global_super, stack, oparg & 2, NULL);
                 DECREF_INPUTS();
                 ERROR_IF(super == NULL, error);
                 res = PyObject_GetAttr(super, name);

@@ -1053,21 +1053,21 @@ compiler_addop_name(struct compiler_unit *u, location loc,
     }
     if (opcode == LOAD_SUPER_ATTR) {
         arg <<= 2;
+        arg |= 2;
     }
     if (opcode == LOAD_SUPER_METHOD) {
         opcode = LOAD_SUPER_ATTR;
         arg <<= 2;
-        arg |= 1;
+        arg |= 3;
     }
     if (opcode == LOAD_ZERO_SUPER_ATTR) {
         opcode = LOAD_SUPER_ATTR;
         arg <<= 2;
-        arg |= 2;
     }
     if (opcode == LOAD_ZERO_SUPER_METHOD) {
         opcode = LOAD_SUPER_ATTR;
         arg <<= 2;
-        arg |= 3;
+        arg |= 1;
     }
     return codegen_addop_i(&u->u_instr_sequence, opcode, arg, loc);
 }