Changeset 272127 in webkit

Timestamp:

Jan 31, 2021 12:48:01 PM (18 months ago)

Author:

ysuzuki@apple.com

Message:

Date.parse returns non-integral time value
​https://bugs.webkit.org/show_bug.cgi?id=220687

Reviewed by Ross Kirsling.

JSTests:

• complex.yaml:
• complex/date-parse-milliseconds.js: Added.

(shouldBe):

Source/WTF:

Use milliseconds instead of seconds as a base unit to avoid floating point rounding for milliseconds.

• wtf/DateMath.cpp:

(WTF::ymdhmsToMilliseconds):
(WTF::parseES5TimePortion):
(WTF::parseES5DateFromNullTerminatedCharacters):
(WTF::parseDateFromNullTerminatedCharacters):
(WTF::ymdhmsToSeconds): Deleted.

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/complex.yaml (modified) (1 diff)
• JSTests/complex/date-parse-milliseconds.js (added)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/DateMath.cpp (modified) (8 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2021-01-31  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        Date.parse returns non-integral time value
+        https://bugs.webkit.org/show_bug.cgi?id=220687
+
+        Reviewed by Ross Kirsling.
+
+        * complex.yaml:
+        * complex/date-parse-milliseconds.js: Added.
+        (shouldBe):
+
 2021-01-29  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/JSTests/complex.yaml

@@ -41 +41 @@
 - path: complex/timezone-range-cache-with-dst.js
   cmd: runComplexTest [], [], "TZ=America/Los_Angeles", "--useDollarVM=1"
+
+- path: complex/date-parse-milliseconds.js
+  cmd: runComplexTest [], [], "TZ=America/Los_Angeles", "--useDollarVM=1"

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-01-31  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        Date.parse returns non-integral time value
+        https://bugs.webkit.org/show_bug.cgi?id=220687
+
+        Reviewed by Ross Kirsling.
+
+        Use milliseconds instead of seconds as a base unit to avoid floating point rounding for milliseconds.
+
+        * wtf/DateMath.cpp:
+        (WTF::ymdhmsToMilliseconds):
+        (WTF::parseES5TimePortion):
+        (WTF::parseES5DateFromNullTerminatedCharacters):
+        (WTF::parseDateFromNullTerminatedCharacters):
+        (WTF::ymdhmsToSeconds): Deleted.
+
 2021-01-30  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WTF/wtf/DateMath.cpp

@@ -372 +372 @@
 }
 
-static inline double ymdhmsToSeconds(int year, long mon, long day, long hour, long minute, double second)
+static inline double ymdhmsToMilliseconds(int year, long mon, long day, long hour, long minute, long second, double milliseconds)
 {
     int mday = firstDayOfMonth[isLeapYear(year)][mon - 1];
     double ydays = daysFrom1970ToYear(year);
 
-    double dateSeconds = second + minute * secondsPerMinute + hour * secondsPerHour + (mday + day - 1 + ydays) * secondsPerDay;
+    double dateMilliseconds = milliseconds + second * msPerSecond + minute * (secondsPerMinute * msPerSecond) + hour * (secondsPerHour * msPerSecond) + (mday + day - 1 + ydays) * (secondsPerDay * msPerSecond);
 
     // Clamp to EcmaScript standard (ecma262/#sec-time-values-and-time-range) of
     //  +/- 100,000,000 days from 01 January, 1970.
-    if (dateSeconds < -8640000000000.0 || dateSeconds > 8640000000000.0)
-        return std::numeric_limits<double>::quiet_NaN();
-    
-    return dateSeconds;
+    if (dateMilliseconds < -8640000000000000.0 || dateMilliseconds > 8640000000000000.0)
+        return std::numeric_limits<double>::quiet_NaN();
+    
+    return dateMilliseconds;
 }
 
@@ -507 +507 @@
 // Fractional seconds parsing is lenient, allows any number of digits.
 // Returns 0 if a parse error occurs, else returns the end of the parsed portion of the string.
-static char* parseES5TimePortion(char* currentPosition, long& hours, long& minutes, double& seconds, bool& isLocalTime, long& timeZoneSeconds)
+static char* parseES5TimePortion(char* currentPosition, long& hours, long& minutes, long& seconds, double& milliseconds, bool& isLocalTime, long& timeZoneSeconds)
 {
     isLocalTime = false;
@@ -532 +532 @@
         ++currentPosition;
     
-        long intSeconds;
         if (!isASCIIDigit(*currentPosition))
             return nullptr;
-        if (!parseLong(currentPosition, &postParsePosition, 10, &intSeconds))
+        if (!parseLong(currentPosition, &postParsePosition, 10, &seconds))
             return nullptr;
         if ((postParsePosition - currentPosition) != 2)
             return nullptr;
-        seconds = intSeconds;
         if (*postParsePosition == '.') {
             currentPosition = postParsePosition + 1;
@@ -555 +553 @@
             
             long numFracDigits = postParsePosition - currentPosition;
-            seconds += fracSeconds * pow(10.0, static_cast<double>(-numFracDigits));
+            milliseconds = fracSeconds * pow(10.0, static_cast<double>(-numFracDigits + 3));
         }
         currentPosition = postParsePosition;
@@ -638 +636 @@
     long hours = 0;
     long minutes = 0;
-    double seconds = 0;
+    long seconds = 0;
+    double milliseconds = 0;
     long timeZoneSeconds = 0;
 
@@ -649 +648 @@
     if (*currentPosition == 'T') {
         // Parse the time HH:mm[:ss[.sss]][Z|(+|-)(00:00|0000|00)]
-        currentPosition = parseES5TimePortion(currentPosition + 1, hours, minutes, seconds, isLocalTime, timeZoneSeconds);
+        currentPosition = parseES5TimePortion(currentPosition + 1, hours, minutes, seconds, milliseconds, isLocalTime, timeZoneSeconds);
         if (!currentPosition)
             return std::numeric_limits<double>::quiet_NaN();
@@ -673 +672 @@
     if (seconds < 0 || seconds >= 61)
         return std::numeric_limits<double>::quiet_NaN();
-    if (seconds > 60) {
+    if (seconds == 60) {
         // Discard leap seconds by clamping to the end of a minute.
-        seconds = 60;
+        milliseconds = 0;
     }
         
-    double dateSeconds = ymdhmsToSeconds(year, month, day, hours, minutes, seconds) - timeZoneSeconds;
-    return dateSeconds * msPerSecond;
+    return ymdhmsToMilliseconds(year, month, day, hours, minutes, seconds, milliseconds) - (timeZoneSeconds * msPerSecond);
 }
 
@@ -984 +982 @@
     ASSERT(year);
 
-    double dateSeconds = ymdhmsToSeconds(year.value(), month + 1, day, hour, minute, second) - offset * secondsPerMinute;
-    return dateSeconds * msPerSecond;
+    return ymdhmsToMilliseconds(year.value(), month + 1, day, hour, minute, second, 0) - offset * (secondsPerMinute * msPerSecond);
 }