Fix bug in date code (issue 736) where -0 was not mapped to 0. This caused the

runtime system to throw an exception because it expected smi arguments.

Review URL: http://codereview.chromium.org/2848038

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@5013 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/date.js b/src/date.js
index e780cb86a5435ed7247edc86d1aa7cdbf035aaa8..83fca27cd4fb3f263bf52aba628556da6f0c490f 100644 (file)
--- a/src/date.js
+++ b/src/date.js
@@ -347,9 +347,10 @@ function DateFromTime(t) {
 function MakeDay(year, month, date) {
   if (!$isFinite(year) || !$isFinite(month) || !$isFinite(date)) return $NaN;
 
-  year = TO_INTEGER(year);
-  month = TO_INTEGER(month);
-  date = TO_INTEGER(date);
+  // Convert to integer and map -0 to 0.
+  year = TO_INTEGER_MAP_MINUS_ZERO(year);
+  month = TO_INTEGER_MAP_MINUS_ZERO(month);
+  date = TO_INTEGER_MAP_MINUS_ZERO(date);
 
   if (year < kMinYear || year > kMaxYear ||
       month < kMinMonth || month > kMaxMonth ||

diff --git a/src/macros.py b/src/macros.py
index 7d9791824592621cb996b6e70a38efa2dbad6c6e..32c965140b58d1f6e188bd15c9a4624a397d3730 100644 (file)
--- a/src/macros.py
+++ b/src/macros.py
@@ -120,6 +120,7 @@ macro IS_SPEC_OBJECT_OR_NULL(arg) = (%_IsObject(arg) || %_IsFunction(arg));
 # Inline macros. Use %IS_VAR to make sure arg is evaluated only once.
 macro NUMBER_IS_NAN(arg) = (!%_IsSmi(%IS_VAR(arg)) && !(arg == arg));
 macro TO_INTEGER(arg) = (%_IsSmi(%IS_VAR(arg)) ? arg : ToInteger(arg));
+macro TO_INTEGER_MAP_MINUS_ZERO(arg) = (%_IsSmi(%IS_VAR(arg)) ? arg : %NumberToIntegerMapMinusZero(ToNumber(arg)));
 macro TO_INT32(arg) = (%_IsSmi(%IS_VAR(arg)) ? arg : (arg >> 0));
 macro TO_UINT32(arg) = (arg >>> 0);
 macro TO_STRING_INLINE(arg) = (IS_STRING(%IS_VAR(arg)) ? arg : NonStringToString(arg));

diff --git a/src/runtime.cc b/src/runtime.cc
index e81b1825a2b3504de6df85a1d558702b2450fd91..a3eb09ffa8c564c13bb5e6dcf1eba24a6b8805ca 100644 (file)
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -5368,9 +5368,6 @@ static Object* Runtime_NumberToInteger(Arguments args) {
 }
 
 
-
-
-
 static Object* Runtime_NumberToIntegerMapMinusZero(Arguments args) {
   NoHandleAllocation ha;
   ASSERT(args.length() == 1);

diff --git a/test/mjsunit/date.js b/test/mjsunit/date.js
index b264a19c3da53362eb6b4b8e91045d543a79d950..57fc5a0e8e24c7a574def84c3d88f8e904b109ba 100644 (file)
--- a/test/mjsunit/date.js
+++ b/test/mjsunit/date.js
@@ -154,6 +154,15 @@ function testToLocaleTimeString() {
 
 testToLocaleTimeString();
 
+// Test that -0 is treated correctly in MakeDay.
+var d = new Date();
+assertDoesNotThrow("d.setDate(-0)");
+assertDoesNotThrow("new Date(-0, -0, -0, -0, -0, -0. -0)");
+assertDoesNotThrow("new Date(0x40000000, 0x40000000, 0x40000000," +
+                   "0x40000000, 0x40000000, 0x40000000, 0x40000000)")
+assertDoesNotThrow("new Date(-0x40000001, -0x40000001, -0x40000001," +
+                   "-0x40000001, -0x40000001, -0x40000001, -0x40000001)")
+
 
 // Modified test from WebKit
 // LayoutTests/fast/js/script-tests/date-utc-timeclip.js: