Adjust return values

Author: colesbury

Include/internal/pycore_opcode_metadata.h

@@ -2786,12 +2786,12 @@ _PyObject_LookupSpecialMethod(PyObject *attr, _PyStackRef *method_and_self)
     _PyType_LookupStackRefAndVersion(Py_TYPE(self), attr, &method_and_self[0]);
     PyObject *method_o = PyStackRef_AsPyObjectBorrow(method_and_self[0]);
     if (method_o == NULL) {
-        return -1;
+        return 0;
     }
 
     if (_PyType_HasFeature(Py_TYPE(method_o), Py_TPFLAGS_METHOD_DESCRIPTOR)) {
         /* Avoid temporary PyMethodObject */
-        return 0;
+        return 1;
     }
 
     descrgetfunc f = Py_TYPE(method_o)->tp_descr_get;
@@ -2804,7 +2804,7 @@ _PyObject_LookupSpecialMethod(PyObject *attr, _PyStackRef *method_and_self)
         method_and_self[0] = PyStackRef_FromPyObjectSteal(func);
     }
     PyStackRef_CLEAR(method_and_self[1]); // clear self
-    return 0;
+    return 1;
 }
 
 static int

Include/internal/pycore_uop_ids.h

@@ -3365,33 +3365,23 @@ dummy_func(
             _FOR_ITER_GEN_FRAME +
             _PUSH_FRAME;
 
-        op(_INSERT_NULL, (arg -- arg1, arg2)) {
-            arg1 = PyStackRef_NULL;
-            arg2 = arg;
-            DEAD(arg);
-        }
-
-        op(_LOAD_SPECIAL, (null, self -- method_and_self[2])) {
-            method_and_self[0] = null;
-            method_and_self[1] = self;
+        inst(LOAD_SPECIAL, (owner -- method_and_self[2])) {
+            method_and_self[0] = PyStackRef_NULL;
+            method_and_self[1] = owner;
             PyObject *name = _Py_SpecialMethods[oparg].name;
             int err = _PyObject_LookupSpecialMethod(name, method_and_self);
             if (err < 0) {
-                if (!_PyErr_Occurred(tstate)) {
-                    _PyErr_Format(tstate, PyExc_TypeError,
-                                  _Py_SpecialMethods[oparg].error,
-                                  PyStackRef_TYPE(method_and_self[1])->tp_name);
-                    ERROR_NO_POP();
-                }
+                ERROR_NO_POP();
+            }
+            else if (err == 0) {
+                _PyErr_Format(tstate, PyExc_TypeError,
+                              _Py_SpecialMethods[oparg].error,
+                              PyStackRef_TYPE(method_and_self[1])->tp_name);
                 ERROR_NO_POP();
             }
             INPUTS_DEAD();
         }
 
-        macro(LOAD_SPECIAL) =
-            _INSERT_NULL +
-            _LOAD_SPECIAL;
-
         inst(WITH_EXCEPT_START, (exit_func, exit_self, lasti, unused, val -- exit_func, exit_self, lasti, unused, val, res)) {
             /* At the top of the stack are 4 values:
                - val: TOP = exc_info()