[GR-23245] Improved precision of int.__truediv__

PullRequest: graalpython/1039

Author: otethal

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/grammar/BinaryArithTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -110,7 +110,7 @@ public void complexBinaryArith2() {
                         "d = 2 ** 4\n" + //
                         "e = 2.5 ** 3.0\n" + //
                         "print(a,b,c,d,e)\n";
-        assertPrints("1.0734391914109869e+17 1.0734391914109868e+18 -821361754992.0 16 15.625\n", source);
+        assertPrints("1.0734391914109867e+17 1.0734391914109868e+18 -821361754992.0 16 15.625\n", source);
     }
 
     @Test

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

@@ -14,3 +14,4 @@
 *graalpython.lib-python.3.test.test_long.LongTest.test_shift_bool
 *graalpython.lib-python.3.test.test_long.LongTest.test_small_ints
 *graalpython.lib-python.3.test.test_long.LongTest.test_to_bytes
+*graalpython.lib-python.3.test.test_long.LongTest.test_true_division

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

@@ -41,9 +41,12 @@
 package com.oracle.graal.python.builtins.objects.ints;
 
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__LT__;
+import static com.oracle.graal.python.runtime.exception.PythonErrorType.OverflowError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.math.RoundingMode;
 import java.util.List;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -73,6 +76,7 @@
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
+import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallVarargsNode;
@@ -324,37 +328,49 @@ public abstract static class TrueDivNode extends PythonBinaryBuiltinNode {
             if (right.isZero()) {
                 throw raise(PythonErrorType.ZeroDivisionError, ErrorMessages.DIVISION_BY_ZERO);
             }
-            return op(PInt.longToBigInteger(left), right.getValue());
+            return op(PInt.longToBigInteger(left), right.getValue(), getRaiseNode());
         }
 
         @Specialization
         double doPL(PInt left, long right) {
             if (right == 0) {
                 throw raise(PythonErrorType.ZeroDivisionError, ErrorMessages.DIVISION_BY_ZERO);
             }
-            return op(left.getValue(), PInt.longToBigInteger(right));
+            return op(left.getValue(), PInt.longToBigInteger(right), getRaiseNode());
         }
 
         @Specialization
         double doPP(PInt left, PInt right) {
             if (right.isZero()) {
                 throw raise(PythonErrorType.ZeroDivisionError, ErrorMessages.DIVISION_BY_ZERO);
             }
-            return op(left.getValue(), right.getValue());
+            return op(left.getValue(), right.getValue(), getRaiseNode());
         }
 
         /*
          * We must take special care to do double conversion late (if possible), to avoid loss of
          * precision.
          */
         @TruffleBoundary
-        private static double op(BigInteger a, BigInteger b) {
-            BigInteger[] divideAndRemainder = a.divideAndRemainder(b);
-            if (divideAndRemainder[1].equals(BigInteger.ZERO)) {
-                return divideAndRemainder[0].doubleValue();
-            } else {
+        private static double op(BigInteger a, BigInteger b, PRaiseNode raiseNode) {
+            final int precisionOfDouble = 17;
+            if (fitsIntoDouble(a) && fitsIntoDouble(b)) {
                 return a.doubleValue() / b.doubleValue();
             }
+            BigDecimal aDecimal = new BigDecimal(a);
+            BigDecimal bDecimal = new BigDecimal(b);
+            int aPrec = aDecimal.precision();
+            int bPrec = bDecimal.precision();
+            BigDecimal result = aDecimal.divide(bDecimal, bPrec - aPrec + precisionOfDouble, RoundingMode.HALF_EVEN);
+            double d = result.doubleValue();
+            if (Double.isInfinite(d)) {
+                throw raiseNode.raise(OverflowError, ErrorMessages.INTEGER_DIVISION_RESULT_TOO_LARGE);
+            }
+            return d;
+        }
+
+        private static boolean fitsIntoDouble(BigInteger x) {
+            return x.bitLength() < 53;
         }
 
         @SuppressWarnings("unused")
@@ -724,7 +740,7 @@ PInt doPLPos(PInt left, long right, @SuppressWarnings("unused") PNone none) {
 
         @Specialization(guards = "right < 0")
         double doPLNeg(PInt left, long right, @SuppressWarnings("unused") PNone none) {
-            return TrueDivNode.op(BigInteger.ONE, op(left.getValue(), -right));
+            return TrueDivNode.op(BigInteger.ONE, op(left.getValue(), -right), getRaiseNode());
         }
 
         @Specialization

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -246,6 +246,7 @@ public abstract class ErrorMessages {
     public static final String INT_CANT_CONVERT_STRING_EITH_EXPL_BASE = "int() can't convert non-string with explicit base";
     public static final String INT_TOO_LARGE_TO_CONVERT_TO_FLOAT = "int too large to convert to float";
     public static final String INTEGER_DIVISION_BY_ZERO = "ZeroDivisionError: integer division or modulo by zero";
+    public static final String INTEGER_DIVISION_RESULT_TOO_LARGE = "integer division result too large for a float";
     public static final String INTEGER_EXPECTED_GOT_FLOAT = "integer argument expected, got float";
     public static final String INTEGER_GREATER_THAN_MAX = "integer is greater than maximum";
     public static final String INTEGER_IS_REQUIRED = "an integer is required";