Update ObjectToString to Harmony-draft algorithm

src/api.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/api.h"
 
 #include <string.h>  // For memcpy, strlen.
 #ifdef V8_USE_ADDRESS_SANITIZER
 #include <sanitizer/asan_interface.h>
 #endif  // V8_USE_ADDRESS_SANITIZER
@@ skipping 3361 matching lines @@
 
 Local<String> v8::Object::ObjectProtoToString() {
   i::Isolate* i_isolate = Utils::OpenHandle(this)->GetIsolate();
   Isolate* isolate = reinterpret_cast<Isolate*>(i_isolate);
   ON_BAILOUT(i_isolate, "v8::Object::ObjectProtoToString()",
              return Local<v8::String>());
   ENTER_V8(i_isolate);
   i::Handle<i::JSObject> self = Utils::OpenHandle(this);
 
   i::Handle<i::Object> name(self->class_name(), i_isolate);
+  i::Handle<i::Object> tag;
 
   // Native implementation of Object.prototype.toString (v8natives.js):
   //   var c = %_ClassOf(this);
   //   if (c === 'Arguments') c  = 'Object';
   //   return "[object " + c + "]";
 
   if (!name->IsString()) {
     return v8::String::NewFromUtf8(isolate, "[object ]");
   } else {
     i::Handle<i::String> class_name = i::Handle<i::String>::cast(name);
     if (i::String::Equals(class_name,
                           i_isolate->factory()->Arguments_string())) {
       return v8::String::NewFromUtf8(isolate, "[object Object]");
     } else {
+      if (internal::FLAG_harmony_tostring) {
+        i::Handle<i::Symbol> toStringTag = Utils::OpenHandle(
+            *Symbol::GetToStringTag(isolate));
+        tag = i::Runtime::GetObjectProperty(

[Dmitry Lomov (no reviews), 2014/10/18 15:16:48]

This calls into Javascript, so needs EXCEPTION_PREAMBLE/EXCEPTION_BAILOUT_CHECK.
(also add a test for for JS object that throws in toString handle. The code as
you wrote it will just crash if that happens)

+            i_isolate, self, toStringTag).ToHandleChecked();
+
+        if (!tag->IsUndefined()) {
+          if (!tag->IsString()) {
+            return v8::String::NewFromUtf8(isolate, "[object ???]");
+          } else {
+            i::Handle<i::String> tag_name = i::Handle<i::String>::cast(tag);
+            using namespace internal;

[Dmitry Lomov (no reviews), 2014/10/18 15:16:48]

Nit: remove 'using namespace internal' here, we use i:: prefix everywhere.
Suggestion: extract all this tag checking logic into a helper function:
  bool GetPredefinedToString(Handle<String>* result)

+            if (!i::String::Equals(class_name, tag_name)) {
+              if (i::String::Equals(
+                  tag_name, i_isolate->factory()->Arguments_string())) {

[Dmitry Lomov (no reviews), 2014/10/18 15:16:48]

Nit: introduce variable for i_isolate->factory()

+                return v8::String::NewFromUtf8(isolate, "[object ~Arguments]");
+              } else if (i::String::Equals(
+                  tag_name, i_isolate->factory()->Array_string())) {
+                return v8::String::NewFromUtf8(isolate, "[object ~Array]");
+              } else if (i::String::Equals(
+                  tag_name, i_isolate->factory()->Boolean_string())) {
+                return v8::String::NewFromUtf8(isolate, "[object ~Boolean]");
+              } else if (i::String::Equals(
+                  tag_name, i_isolate->factory()->Date_string())) {
+                return v8::String::NewFromUtf8(isolate, "[object ~Date]");
+              } else if (i::String::Equals(
+                  tag_name, i_isolate->factory()->Error_string())) {
+                return v8::String::NewFromUtf8(isolate, "[object ~Error]");
+              } else if (i::String::Equals(
+                  tag_name, i_isolate->factory()->Function_string())) {
+                return v8::String::NewFromUtf8(isolate, "[object ~Function]");
+              } else if (i::String::Equals(
+                  tag_name, i_isolate->factory()->Number_string())) {
+                return v8::String::NewFromUtf8(isolate, "[object ~Number]");
+              } else if (i::String::Equals(
+                  tag_name, i_isolate->factory()->RegExp_string())) {
+                return v8::String::NewFromUtf8(isolate, "[object ~RegExp]");
+              } else if (i::String::Equals(
+                  tag_name, i_isolate->factory()->String_string())) {
+                return v8::String::NewFromUtf8(isolate, "[object ~String]");
+              } else {
+                class_name = tag_name;
+              }
+            }
+          }
+        }
+      }
       const char* prefix = "[object ";
       Local<String> str = Utils::ToLocal(class_name);
       const char* postfix = "]";
 
       int prefix_len = i::StrLength(prefix);
       int str_len = str->Utf8Length();
       int postfix_len = i::StrLength(postfix);
 
       int buf_len = prefix_len + str_len + postfix_len;
       i::ScopedVector<char> buf(buf_len);
@@ skipping 2786 matching lines @@
 Local<Symbol> v8::Symbol::GetIterator(Isolate* isolate) {
   return GetWellKnownSymbol(isolate, "Symbol.iterator");
 }
 
 
 Local<Symbol> v8::Symbol::GetUnscopables(Isolate* isolate) {
   return GetWellKnownSymbol(isolate, "Symbol.unscopables");
 }
 
 
+Local<Symbol> v8::Symbol::GetToStringTag(Isolate* isolate) {
+  return GetWellKnownSymbol(isolate, "Symbol.toStringTag");
+}
+
+
 Local<Private> v8::Private::New(Isolate* isolate, Local<String> name) {
   i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
   LOG_API(i_isolate, "Private::New()");
   ENTER_V8(i_isolate);
   i::Handle<i::Symbol> symbol = i_isolate->factory()->NewPrivateSymbol();
   if (!name.IsEmpty()) symbol->set_name(*Utils::OpenHandle(*name));
   Local<Symbol> result = Utils::ToLocal(symbol);
   return v8::Handle<Private>(reinterpret_cast<Private*>(*result));
 }
 
@@ skipping 1449 matching lines @@
   Isolate* isolate = reinterpret_cast<Isolate*>(info.GetIsolate());
   Address callback_address =
       reinterpret_cast<Address>(reinterpret_cast<intptr_t>(callback));
   VMState<EXTERNAL> state(isolate);
   ExternalCallbackScope call_scope(isolate, callback_address);
   callback(info);
 }
 
 
 } }  // namespace v8::internal