Fixed comparison of floats to large ints

Author: otethal

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_long.txt

@@ -17,6 +17,7 @@
 *graalpython.lib-python.3.test.test_long.LongTest.test_long
 *graalpython.lib-python.3.test.test_long.LongTest.test_format
 *graalpython.lib-python.3.test.test_long.LongTest.test_lshift_of_zero
+*graalpython.lib-python.3.test.test_long.LongTest.test_mixed_compares
 *graalpython.lib-python.3.test.test_long.LongTest.test_mod_division
 *graalpython.lib-python.3.test.test_long.LongTest.test_nan_inf
 *graalpython.lib-python.3.test.test_long.LongTest.test_negative_shift_count

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java

@@ -936,7 +936,7 @@ boolean eqDbLn(double a, long b) {
 
         @Specialization
         boolean eqDbPI(double a, PInt b) {
-            return Double.isFinite(a) && a == b.doubleValue();
+            return compareDoubleToLargeInt(a, b) == 0;
         }
 
         @Specialization
@@ -962,6 +962,23 @@ Object eqPDb(VirtualFrame frame, PythonNativeObject left, PInt right,
         PNotImplemented eq(Object a, Object b) {
             return PNotImplemented.NOT_IMPLEMENTED;
         }
+
+        // adapted from CPython's float_richcompare in floatobject.c
+        static double compareDoubleToLargeInt(double v, PInt w) {
+            if (!Double.isFinite(v)) {
+                return v;
+            }
+            int vsign = v == 0.0 ? 0 : v < 0.0 ? -1 : 1;
+            int wsign = w.isZero() ? 0 : w.isNegative() ? -1 : 1;
+            if (vsign != wsign) {
+                return vsign - wsign;
+            }
+            if (w.bitLength() <= 48) {
+                return v - w.doubleValue();
+            } else {
+                return new BigDecimal(v).compareTo(new BigDecimal(w.getValue()));
+            }
+        }
     }
 
     @Builtin(name = __NE__, minNumOfPositionalArgs = 2)
@@ -980,7 +997,7 @@ boolean neDbLn(double a, long b) {
 
         @Specialization
         boolean neDbPI(double a, PInt b) {
-            return !(Double.isFinite(a) && a == b.doubleValue());
+            return EqNode.compareDoubleToLargeInt(a, b) != 0;
         }
 
         @Specialization
@@ -1024,7 +1041,7 @@ boolean doDL(double x, long y) {
 
         @Specialization
         boolean doPI(double x, PInt y) {
-            return x < y.doubleValue();
+            return EqNode.compareDoubleToLargeInt(x, y) < 0;
         }
 
         @Specialization(guards = "fromNativeNode.isFloatSubtype(frame, y, getClass, isSubtype, context)", limit = "1")
@@ -1089,7 +1106,7 @@ boolean doDL(double x, long y) {
 
         @Specialization
         boolean doPI(double x, PInt y) {
-            return x <= y.doubleValue();
+            return EqNode.compareDoubleToLargeInt(x, y) <= 0;
         }
 
         @Specialization(guards = "fromNativeNode.isFloatSubtype(frame, y, getClass, isSubtype, context)", limit = "1")
@@ -1154,7 +1171,7 @@ boolean doDL(double x, long y) {
 
         @Specialization
         boolean doPI(double x, PInt y) {
-            return x > y.doubleValue();
+            return EqNode.compareDoubleToLargeInt(x, y) > 0;
         }
 
         @Specialization(guards = "fromNativeNode.isFloatSubtype(frame, y, getClass, isSubtype, context)", limit = "1")
@@ -1219,7 +1236,7 @@ boolean doDL(double x, long y) {
 
         @Specialization
         boolean doPI(double x, PInt y) {
-            return x >= y.doubleValue();
+            return EqNode.compareDoubleToLargeInt(x, y) >= 0;
         }
 
         @Specialization(guards = "fromNativeNode.isFloatSubtype(frame, y, getClass, isSubtype, context)", limit = "1")

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/PInt.java

@@ -82,9 +82,8 @@ public boolean isOne() {
         return value.equals(BigInteger.ONE);
     }
 
-    @TruffleBoundary(allowInlining = true)
     public boolean isZero() {
-        return value.equals(BigInteger.ZERO);
+        return value.signum() == 0;
     }
 
     @ExportMessage