Only consider Py_ABS(Py_SIZE(int)) <= 1

Author: sweeneyde

Include/internal/pycore_long.h

@@ -24,7 +24,6 @@ static inline PyObject* _PyLong_GetOne(void)
 PyObject *_PyLong_Add(PyLongObject *left, PyLongObject *right);
 PyObject *_PyLong_Multiply(PyLongObject *left, PyLongObject *right);
 PyObject *_PyLong_Subtract(PyLongObject *left, PyLongObject *right);
-Py_ssize_t _PyLong_RichCompare(PyLongObject *left, PyLongObject *right);
 
 /* Used by Python/mystrtoul.c, _PyBytes_FromHex(),
    _PyBytes_DecodeEscape(), etc. */

Objects/longobject.c

@@ -2956,23 +2956,15 @@ long_compare(PyLongObject *a, PyLongObject *b)
     return sign;
 }
 
-Py_ssize_t
-_PyLong_RichCompare(PyLongObject *left, PyLongObject *right)
-{
-    if (left == right) {
-        return 0;
-    }
-    else {
-        return long_compare(left, right);
-    }
-}
-
 static PyObject *
 long_richcompare(PyObject *self, PyObject *other, int op)
 {
+    Py_ssize_t result;
     CHECK_BINOP(self, other);
-    Py_ssize_t result = _PyLong_RichCompare((PyLongObject *)self,
-                                            (PyLongObject *)other);
+    if (self == other)
+        result = 0;
+    else
+        result = long_compare((PyLongObject*)self, (PyLongObject*)other);
     Py_RETURN_RICHCOMPARE(result, 0, op);
 }
 

Python/ceval.c

@@ -3716,6 +3716,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             DEOPT_IF(!PyFloat_CheckExact(right), COMPARE_OP);
             double dleft = PyFloat_AS_DOUBLE(left);
             double dright = PyFloat_AS_DOUBLE(right);
+            int sign = (dleft > dright) - (dleft < dright);
             DEOPT_IF(isnan(dleft), COMPARE_OP);
             DEOPT_IF(isnan(dright), COMPARE_OP);
             STAT_INC(COMPARE_OP, hit);
@@ -3724,7 +3725,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             Py_DECREF(left);
             Py_DECREF(right);
             assert(opcode == POP_JUMP_IF_TRUE || opcode == POP_JUMP_IF_FALSE);
-            int sign = (dleft > dright) - (dleft < dright);
             int jump = (1 << (sign + 1)) & mask;
             if (!jump) {
                 next_instr++;
@@ -3746,16 +3746,18 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
             PyObject *left = SECOND();
             DEOPT_IF(!PyLong_CheckExact(left), COMPARE_OP);
             DEOPT_IF(!PyLong_CheckExact(right), COMPARE_OP);
+            DEOPT_IF((size_t)(Py_SIZE(left) + 1) > 2, COMPARE_OP);
+            DEOPT_IF((size_t)(Py_SIZE(right) + 1) > 2, COMPARE_OP);
             STAT_INC(COMPARE_OP, hit);
-            // This cannot fail.
-            Py_ssize_t cmp = _PyLong_RichCompare((PyLongObject *)left,
-                                                 (PyLongObject *)right);
+            assert(Py_ABS(Py_SIZE(left)) <= 1 && Py_ABS(Py_SIZE(right)) <= 1);
+            Py_ssize_t ileft = Py_SIZE(left) * ((PyLongObject *)left)->ob_digit[0];
+            Py_ssize_t iright = Py_SIZE(right) * ((PyLongObject *)right)->ob_digit[0];
+            int sign = (ileft > iright) - (ileft < iright);
             NEXTOPARG();
             STACK_SHRINK(2);
             Py_DECREF(left);
             Py_DECREF(right);
             assert(opcode == POP_JUMP_IF_TRUE || opcode == POP_JUMP_IF_FALSE);
-            int sign = (cmp > 0) - (cmp < 0);
             int jump = (1 << (sign + 1)) & mask;
             if (!jump) {
                 next_instr++;

Python/specialize.c

@@ -495,6 +495,7 @@ initial_counter_value(void) {
 #define SPEC_FAIL_STRING_COMPARE 13
 #define SPEC_FAIL_STRING_UNREADY 14
 #define SPEC_FAIL_NOT_FOLLOWED_BY_COND_JUMP 15
+#define SPEC_FAIL_BIG_INT 16
 
 static int
 specialize_module_load_attr(
@@ -1589,9 +1590,15 @@ _Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs,
         goto success;
     }
     if (PyLong_CheckExact(lhs)) {
-        *instr = _Py_MAKECODEUNIT(COMPARE_OP_INT_JUMP, _Py_OPARG(*instr));
-        cache1->mask = mask;
-        goto success;
+        if (Py_ABS(Py_SIZE(lhs)) <= 1 && Py_ABS(Py_SIZE(rhs)) <= 1) {
+            *instr = _Py_MAKECODEUNIT(COMPARE_OP_INT_JUMP, _Py_OPARG(*instr));
+            cache1->mask = mask;
+            goto success;
+        }
+        else {
+            SPECIALIZATION_FAIL(COMPARE_OP, SPEC_FAIL_BIG_INT);
+            goto failure;
+        }
     }
     if (PyUnicode_CheckExact(lhs)) {
         if (op != Py_EQ && op != Py_NE) {