[es6] Use the correct ToPrimitive in the Date Constructor.

This way we can finally remove the ES5 ToPrimitive builtin from
runtime.js, and the Date Constructor now properly supports
@@toPrimitive for the single argument case as well.

CQ_INCLUDE_TRYBOTS=tryserver.v8:v8_linux_layout_dbg,v8_linux_nosnap_dbg
R=rossberg@chromium.org
BUG=v8:4307
LOG=n

Review URL: https://codereview.chromium.org/1346893003

Cr-Commit-Position: refs/heads/master@{#30832}

diff --git a/src/contexts.h b/src/contexts.h
index e5407f1f004f6ffd0c3691039627d2d7de50c303..fb83923b6f2c1d3480cb57873925ddc740ff4596 100644 (file)
--- a/src/contexts.h
+++ b/src/contexts.h
@@ -86,7 +86,6 @@ enum BindingFlags {
   V(SPREAD_ITERABLE_INDEX, JSFunction, spread_iterable)                   \
   V(TO_LENGTH_FUN_INDEX, JSFunction, to_length_fun)                       \
   V(TO_NUMBER_FUN_INDEX, JSFunction, to_number_fun)                       \
   V(SPREAD_ITERABLE_INDEX, JSFunction, spread_iterable)                   \
   V(TO_LENGTH_FUN_INDEX, JSFunction, to_length_fun)                       \
   V(TO_NUMBER_FUN_INDEX, JSFunction, to_number_fun)                       \

-  V(TO_PRIMITIVE_INDEX, JSFunction, to_primitive)                         \

   V(TO_STRING_FUN_INDEX, JSFunction, to_string_fun)
 
 
   V(TO_STRING_FUN_INDEX, JSFunction, to_string_fun)
 
 

diff --git a/src/date.js b/src/date.js
index dd535b6e629322cdca08be4f4bdbc08160ef8799..f7a6a0825b409c320f43f0ffe6cc478b8fb9544e 100644 (file)
--- a/src/date.js
+++ b/src/date.js
@@ -22,7 +22,6 @@ var IsFinite;
 var MathAbs;
 var MathFloor;
 var ToNumber;
 var MathAbs;
 var MathFloor;
 var ToNumber;

-var toPrimitiveSymbol = utils.ImportNow("to_primitive_symbol");

 var ToString;
 
 utils.Import(function(from) {
 var ToString;
 
 utils.Import(function(from) {


@@ -150,6 +149,7 @@ function DateConstructor(year, month, date, hours, minutes, seconds, ms) {
   } else if (argc == 1) {
     if (IS_NUMBER(year)) {
       value = year;
   } else if (argc == 1) {
     if (IS_NUMBER(year)) {
       value = year;

+

     } else if (IS_STRING(year)) {
       // Probe the Date cache. If we already have a time value for the
       // given time, we re-use that instead of parsing the string again.
     } else if (IS_STRING(year)) {
       // Probe the Date cache. If we already have a time value for the
       // given time, we re-use that instead of parsing the string again.


@@ -165,15 +165,11 @@ function DateConstructor(year, month, date, hours, minutes, seconds, ms) {
         }
       }
 
         }
       }
 

+    } else if (IS_DATE(year)) {
+      value = UTC_DATE_VALUE(year);
+

     } else {
     } else {

-      // According to ECMA 262, no hint should be given for this
-      // conversion. However, ToPrimitive defaults to STRING_HINT for
-      // Date objects which will lose precision when the Date
-      // constructor is called with another Date object as its
-      // argument. We therefore use NUMBER_HINT for the conversion,
-      // which is the default for everything else than Date objects.
-      // This makes us behave like KJS and SpiderMonkey.
-      var time = $toPrimitive(year, NUMBER_HINT);
+      var time = TO_PRIMITIVE(year);

       value = IS_STRING(time) ? DateParse(time) : ToNumber(time);
     }
     SET_UTC_DATE_VALUE(this, value);
       value = IS_STRING(time) ? DateParse(time) : ToNumber(time);
     }
     SET_UTC_DATE_VALUE(this, value);

diff --git a/src/macros.py b/src/macros.py
index 6dcf4a641e26dbdee24fa0d844eeb11ec492e408..aa994fcde0cbf6c7f433ba79ca7ea7978967fbf6 100644 (file)
--- a/src/macros.py
+++ b/src/macros.py
@@ -39,10 +39,6 @@ define NEW_TWO_BYTE_STRING = false;
 define GETTER = 0;
 define SETTER = 1;
 
 define GETTER = 0;
 define SETTER = 1;
 

-define NO_HINT     = 0;
-define NUMBER_HINT = 1;
-define STRING_HINT = 2;
-

 # For date.js.
 define HoursPerDay      = 24;
 define MinutesPerHour   = 60;
 # For date.js.
 define HoursPerDay      = 24;
 define MinutesPerHour   = 60;

diff --git a/src/runtime.js b/src/runtime.js
index 9ace6ff821db13e977c9c1d387ef433f787805c3..e2eec4f17e9c61594c236846691d3047800657c6 100644 (file)
--- a/src/runtime.js
+++ b/src/runtime.js
@@ -21,7 +21,6 @@ var $toInteger;
 var $toLength;
 var $toNumber;
 var $toPositiveInteger;
 var $toLength;
 var $toNumber;
 var $toPositiveInteger;

-var $toPrimitive;

 var $toString;
 
 var harmony_tolength = false;
 var $toString;
 
 var harmony_tolength = false;


@@ -176,15 +175,6 @@ function CONCAT_ITERABLE_TO_ARRAY(iterable) {
    -------------------------------------
 */
 
    -------------------------------------
 */
 

-// ECMA-262, section 9.1, page 30. Use null/undefined for no hint,
-// (1) for number hint, and (2) for string hint.
-function ToPrimitive(x, hint) {
-  if (!IS_SPEC_OBJECT(x)) return x;
-  if (hint == NO_HINT) hint = (IS_DATE(x)) ? STRING_HINT : NUMBER_HINT;
-  return (hint == NUMBER_HINT) ? DefaultNumber(x) : DefaultString(x);
-}
-
-

 // ECMA-262, section 9.2, page 30
 function ToBoolean(x) {
   if (IS_BOOLEAN(x)) return x;
 // ECMA-262, section 9.2, page 30
 function ToBoolean(x) {
   if (IS_BOOLEAN(x)) return x;


@@ -377,7 +367,6 @@ $toInteger = ToInteger;
 $toLength = ToLength;
 $toNumber = ToNumber;
 $toPositiveInteger = ToPositiveInteger;
 $toLength = ToLength;
 $toNumber = ToNumber;
 $toPositiveInteger = ToPositiveInteger;

-$toPrimitive = ToPrimitive;

 $toString = ToString;
 
 %InstallToContext([
 $toString = ToString;
 
 %InstallToContext([


@@ -394,7 +383,6 @@ $toString = ToString;
   "to_integer_fun", ToInteger,
   "to_length_fun", ToLength,
   "to_number_fun", ToNumber,
   "to_integer_fun", ToInteger,
   "to_length_fun", ToLength,
   "to_number_fun", ToNumber,

-  "to_primitive", ToPrimitive,

   "to_string_fun", ToString,
 ]);
 
   "to_string_fun", ToString,
 ]);
 


@@ -402,7 +390,6 @@ utils.Export(function(to) {
   to.ToBoolean = ToBoolean;
   to.ToLength = ToLength;
   to.ToNumber = ToNumber;
   to.ToBoolean = ToBoolean;
   to.ToLength = ToLength;
   to.ToNumber = ToNumber;

-  to.ToPrimitive = ToPrimitive;

   to.ToString = ToString;
 });
 
   to.ToString = ToString;
 });