binary_op1(), ternary_op(): rearrange the code so that slotw is tested

(to see whether __rop__ should go before __op__) only when slotv is
set.  This saves a test+branch when only slotw is set.

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 7a5305ad892dbb5c58483db370e6c102cac0b6f1..4891622a72252e644a60369a0c54a4a5f243f3f6 100644 (file)
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -332,14 +332,14 @@ binary_op1(PyObject *v, PyObject *w, const int op_slot)
                if (slotw == slotv)
                        slotw = NULL;
        }
-       if (slotw && PyType_IsSubtype(w->ob_type, v->ob_type)) {
-               x = slotw(v, w);
-               if (x != Py_NotImplemented)
-                       return x;
-               Py_DECREF(x); /* can't do it */
-               slotw = NULL;
-       }
        if (slotv) {
+               if (slotw && PyType_IsSubtype(w->ob_type, v->ob_type)) {
+                       x = slotw(v, w);
+                       if (x != Py_NotImplemented)
+                               return x;
+                       Py_DECREF(x); /* can't do it */
+                       slotw = NULL;
+               }
                x = slotv(v, w);
                if (x != Py_NotImplemented)
                        return x;
@@ -442,14 +442,14 @@ ternary_op(PyObject *v,
                if (slotw == slotv)
                        slotw = NULL;
        }
-       if (slotw && PyType_IsSubtype(w->ob_type, v->ob_type)) {
-               x = slotw(v, w, z);
-               if (x != Py_NotImplemented)
-                       return x;
-               Py_DECREF(x); /* can't do it */
-               slotw = NULL;
-       }
        if (slotv) {
+               if (slotw && PyType_IsSubtype(w->ob_type, v->ob_type)) {
+                       x = slotw(v, w, z);
+                       if (x != Py_NotImplemented)
+                               return x;
+                       Py_DECREF(x); /* can't do it */
+                       slotw = NULL;
+               }
                x = slotv(v, w, z);
                if (x != Py_NotImplemented)
                        return x;