From 55dc1fa1e58753b3ee1a4162bbc60b66cb47099b Mon Sep 17 00:00:00 2001
From: Viktor <vic99999@yandex.ru>
Date: Sat, 4 Apr 2015 10:22:14 +0500
Subject: [PATCH] Fix Math.round for very large numbers

Closes #325.
---
 es6-shim.js  | 23 +++++++++++++++++------
 test/math.js | 10 ++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/es6-shim.js b/es6-shim.js
index 5e93dd78..31631df1 100644
--- a/es6-shim.js
+++ b/es6-shim.js
@@ -1550,14 +1550,25 @@
   var expm1OfTen = Math.expm1(10);
   defineProperty(Math, 'expm1', MathShims.expm1, expm1OfTen > 22025.465794806719 || expm1OfTen < 22025.4657948067165168);
 
-  var roundHandlesBoundaryConditions = Math.round(0.5 - Number.EPSILON / 4) === 0 && Math.round(-0.5 + Number.EPSILON / 3.99) === 1;
   var origMathRound = Math.round;
+  // breaks in e.g. Safari 8, Internet Explorer 11, Opera 12
+  var roundHandlesBoundaryConditions = Math.round(0.5 - Number.EPSILON / 4) === 0 && Math.round(-0.5 + Number.EPSILON / 3.99) === 1;
+
+  // When engines use Math.floor(x + 0.5) internally, Math.round can be buggy for large integers.
+  // This behavior should be governed by "round to nearest, ties to even mode"
+  // see https://people.mozilla.org/~jorendorff/es6-draft.html#sec-ecmascript-language-types-number-type
+  // These are the boundary cases where it breaks.
+  var smallestPositiveNumberWhereRoundBreaks = 1 / Number.EPSILON + 1;
+  var largestPositiveNumberWhereRoundBreaks = 2 / Number.EPSILON - 1;
+  var roundDoesNotIncreaseIntegers = [smallestPositiveNumberWhereRoundBreaks, largestPositiveNumberWhereRoundBreaks].every(function (num) {
+    return Math.round(num) === num;
+  });
   defineProperty(Math, 'round', function round(x) {
-    if (-0.5 <= x && x < 0.5 && x !== 0) {
-      return Math.sign(x * 0);
-    }
-    return origMathRound(x);
-  }, !roundHandlesBoundaryConditions);
+    var floor = Math.floor(x);
+    var ceil = floor === -1 ? -0 : floor + 1;
+    return x - floor < 0.5 ? floor : ceil;
+  }, !roundHandlesBoundaryConditions || !roundDoesNotIncreaseIntegers);
+  Value.preserveToString(Math.round, origMathRound);
 
   if (Math.imul(0xffffffff, 5) !== -5) {
     // Safari 6.1, at least, reports "0" for this value
diff --git a/test/math.js b/test/math.js
index c1be5d09..1b7d46c7 100644
--- a/test/math.js
+++ b/test/math.js
@@ -721,6 +721,16 @@ describe('Math', function () {
       expect(isNegativeZero(Math.round(-0.5 + EPSILON / 3.99))).to.equal(true);
       expect(isNegativeZero(Math.round(0 - EPSILON / 3.99))).to.equal(true);
     });
+
+    it('returns 1 / Number.EPSILON + 1 for 1 / Number.EPSILON + 1', function () {
+      var inverseEpsilonPlus1 = 1 / EPSILON + 1;
+      expect(Math.round(inverseEpsilonPlus1)).to.equal(inverseEpsilonPlus1);
+    });
+
+    it('returns 2 / Number.EPSILON - 1 for 2 / Number.EPSILON - 1', function () {
+      var twiceInverseEpsilonMinus1 = 2 / EPSILON - 1;
+      expect(Math.round(twiceInverseEpsilonMinus1)).to.equal(twiceInverseEpsilonMinus1);
+    });
   });
 
   describe('.fround()', function () {