commit 104750cda822763852b41f629f5fa084bb81b16c
author Andrei Korzhevskii <a.korzhevskiy@gmail.com> Mon May 30 13:46:44 2016 +0300
committer Daniel Kurka <dankurka@google.com> Wed Jun 01 08:40:56 2016 +0000
tree 0adf82dbbd1580f9c293aac91f276b2fdcab9761
parent 77c5587f3acba398a89136625bb1367187700a20

Fix Math.rint for IE and htmlunit for numbers >= 2^52

Change-Id: Ib8631b19b2018dbe216782aee92d4c081250401d

user/super/com/google/gwt/emul/java/lang/Math.java

diff --git a/user/super/com/google/gwt/emul/java/lang/Math.java b/user/super/com/google/gwt/emul/java/lang/Math.java
index 06b6f27..2f01351 100644
--- a/user/super/com/google/gwt/emul/java/lang/Math.java
+++ b/user/super/com/google/gwt/emul/java/lang/Math.java
@@ -256,12 +256,18 @@
   }
 
   public static double rint(double x) {
-    double mod2 = x % 2;
-    if ((mod2 == -1.5) || (mod2 == 0.5)) {
-      return NativeMath.floor(x);
-    } else {
-      return NativeMath.round(x);
+    // Floating point has a mantissa with an accuracy of 52 bits so
+    // any number bigger than 2^52 is effectively a finite integer value.
+    // This case also filters out NaN and infinite values.
+    if (NativeMath.abs(x) < (double) (1L << 52)) {
+      double mod2 = x % 2;
+      if ((mod2 == -1.5) || (mod2 == 0.5)) {
+        x = NativeMath.floor(x);
+      } else {
+        x = NativeMath.round(x);
+      }
     }
+    return x;
   }
 
   public static long round(double x) {

user/test/com/google/gwt/emultest/java/lang/MathTest.java

diff --git a/user/test/com/google/gwt/emultest/java/lang/MathTest.java b/user/test/com/google/gwt/emultest/java/lang/MathTest.java
index 4632517..084da67 100644
--- a/user/test/com/google/gwt/emultest/java/lang/MathTest.java
+++ b/user/test/com/google/gwt/emultest/java/lang/MathTest.java
@@ -16,8 +16,6 @@
 
 package com.google.gwt.emultest.java.lang;
 
-import com.google.gwt.junit.DoNotRunWith;
-import com.google.gwt.junit.Platform;
 import com.google.gwt.junit.client.GWTTestCase;
 
 import java.math.BigInteger;
@@ -520,20 +518,6 @@
         Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY,
         Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY,
         Double.NaN, Double.NaN,
-    };
-    for (int i = 0; i < testValues.length;) {
-      double v = testValues[i++];
-      double expected = testValues[i++];
-      double actual = Math.rint(v);
-      assertEquals("value: " + v + ", expected: " + expected + ", actual: " + actual,
-          expected, actual, 0);
-    }
-  }
-
-  @DoNotRunWith(Platform.HtmlUnitBug)
-  public void testRint_DoubleMaxValue() {
-    // format: value to be round and expected value
-    final double[] testValues = {
         Double.MAX_VALUE, Double.MAX_VALUE,
         -Double.MAX_VALUE, -Double.MAX_VALUE,
     };