[builtins] Fix ToString in Array.prototype.join.

The internal ConvertToString helper was using the wrong ToPrimitive,
actually the old ES5 like DefaultString, and it also prematurely
optimized for no real benefit.

BUG=v8:4307
LOG=n

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

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

diff --git a/src/array.js b/src/array.js
index 721121e9b35322a7135fcdb883d90e4bffd52081..b2b038dae3a16335d093e831b2ce3ea8ebf691fb 100644 (file)
--- a/src/array.js
+++ b/src/array.js
@@ -209,10 +209,11 @@ function Join(array, length, separator, convert) {
 
 
 function ConvertToString(x) {
-  // Assumes x is a non-string.
-  if (IS_NUMBER(x)) return %_NumberToString(x);
-  if (IS_BOOLEAN(x)) return x ? 'true' : 'false';
-  return (IS_NULL_OR_UNDEFINED(x)) ? '' : ToString($defaultString(x));
+  if (IS_NULL_OR_UNDEFINED(x)) {
+    return '';
+  } else {
+    return TO_STRING(x);
+  }
 }
 
 
@@ -224,7 +225,7 @@ function ConvertToLocaleString(e) {
     // must throw a TypeError if ToObject(e).toLocaleString isn't
     // callable.
     var e_obj = TO_OBJECT(e);
-    return ToString(e_obj.toLocaleString());
+    return TO_STRING(e_obj.toLocaleString());
   }
 }
 

diff --git a/src/runtime.js b/src/runtime.js
index f0bc13340b62f3050443afdc3e56e810d77b6637..c3b8ed22a1c4d6135d7ab9b13dc90b7f1d38de35 100644 (file)
--- a/src/runtime.js
+++ b/src/runtime.js
@@ -11,7 +11,6 @@
 
 // The following declarations are shared with other native JS files.
 // They are all declared at this one spot to avoid redeclaration errors.
-var $defaultString;
 var $NaN;
 var $nonNumberToNumber;
 var $sameValue;
@@ -345,7 +344,6 @@ function ToPositiveInteger(x, rangeErrorIndex) {
 // ----------------------------------------------------------------------------
 // Exports
 
-$defaultString = DefaultString;
 $NaN = %GetRootNaN();
 $nonNumberToNumber = NonNumberToNumber;
 $sameValue = SameValue;