Reviewers: arv,
Message:
PTAL, api portion (I'm not sure if the description communicates this very
well)
Description:
Update harmony ObjectProtoToString() to 2/2/2015 spec
- Removes special handling of non-string @@toStringTag values (use
builtinTag)
- Removes special handling of @@toStringTags which match [[Class]] names
(remove
~ prefix)
BUG=v8:3502
[email protected]
LOG=N
Please review this at https://codereview.chromium.org/892393003/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+11, -50 lines):
M src/api.cc
M test/cctest/test-api.cc
Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index
6caa82a5ea5d907119da06e0f2b35e7ce7794347..d5168cd3853e2e6129103471f72231512292c1d0
100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -3290,37 +3290,6 @@ Local<Array> v8::Object::GetOwnPropertyNames() {
}
-static bool GetPredefinedToString(i::Handle<i::String> tag,
- Local<String>* result) {
- i::Isolate* i_isolate = tag->GetIsolate();
- Isolate* isolate = reinterpret_cast<Isolate*>(i_isolate);
- i::Factory* factory = i_isolate->factory();
-
- if (i::String::Equals(tag, factory->Arguments_string())) {
- *result = v8::String::NewFromUtf8(isolate, "[object ~Arguments]");
- } else if (i::String::Equals(tag, factory->Array_string())) {
- *result = v8::String::NewFromUtf8(isolate, "[object ~Array]");
- } else if (i::String::Equals(tag, factory->Boolean_string())) {
- *result = v8::String::NewFromUtf8(isolate, "[object ~Boolean]");
- } else if (i::String::Equals(tag, factory->Date_string())) {
- *result = v8::String::NewFromUtf8(isolate, "[object ~Date]");
- } else if (i::String::Equals(tag, factory->Error_string())) {
- *result = v8::String::NewFromUtf8(isolate, "[object ~Error]");
- } else if (i::String::Equals(tag, factory->Function_string())) {
- *result = v8::String::NewFromUtf8(isolate, "[object ~Function]");
- } else if (i::String::Equals(tag, factory->Number_string())) {
- *result = v8::String::NewFromUtf8(isolate, "[object ~Number]");
- } else if (i::String::Equals(tag, factory->RegExp_string())) {
- *result = v8::String::NewFromUtf8(isolate, "[object ~RegExp]");
- } else if (i::String::Equals(tag, factory->String_string())) {
- *result = v8::String::NewFromUtf8(isolate, "[object ~String]");
- } else {
- return false;
- }
- return true;
-}
-
-
Local<String> v8::Object::ObjectProtoToString() {
i::Isolate* i_isolate = Utils::OpenHandle(this)->GetIsolate();
Isolate* isolate = reinterpret_cast<Isolate*>(i_isolate);
@@ -3354,16 +3323,8 @@ Local<String> v8::Object::ObjectProtoToString() {
.ToHandle(&tag);
EXCEPTION_BAILOUT_CHECK(i_isolate, Local<v8::String>());
- if (!tag->IsUndefined()) {
- if (!tag->IsString())
- return v8::String::NewFromUtf8(isolate, "[object ???]");
- i::Handle<i::String> tag_name = i::Handle<i::String>::cast(tag);
- if (!i::String::Equals(class_name, tag_name)) {
- Local<String> result;
- if (GetPredefinedToString(tag_name, &result)) return result;
-
- class_name = tag_name;
- }
+ if (tag->IsString()) {
+ class_name = i::Handle<i::String>::cast(tag);
}
}
const char* prefix = "[object ";
Index: test/cctest/test-api.cc
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index
00092539d783d33e3c219ba5cac0c3ffff426cac..332baab5fc147781f30b4401f4e74d5bc645e7ad
100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -14002,15 +14002,15 @@ TEST(ObjectProtoToStringES6) {
} while (0)
TEST_TOSTRINGTAG(Array, Object, Object);
- TEST_TOSTRINGTAG(Object, Arguments, ~Arguments);
- TEST_TOSTRINGTAG(Object, Array, ~Array);
- TEST_TOSTRINGTAG(Object, Boolean, ~Boolean);
- TEST_TOSTRINGTAG(Object, Date, ~Date);
- TEST_TOSTRINGTAG(Object, Error, ~Error);
- TEST_TOSTRINGTAG(Object, Function, ~Function);
- TEST_TOSTRINGTAG(Object, Number, ~Number);
- TEST_TOSTRINGTAG(Object, RegExp, ~RegExp);
- TEST_TOSTRINGTAG(Object, String, ~String);
+ TEST_TOSTRINGTAG(Object, Arguments, Arguments);
+ TEST_TOSTRINGTAG(Object, Array, Array);
+ TEST_TOSTRINGTAG(Object, Boolean, Boolean);
+ TEST_TOSTRINGTAG(Object, Date, Date);
+ TEST_TOSTRINGTAG(Object, Error, Error);
+ TEST_TOSTRINGTAG(Object, Function, Function);
+ TEST_TOSTRINGTAG(Object, Number, Number);
+ TEST_TOSTRINGTAG(Object, RegExp, RegExp);
+ TEST_TOSTRINGTAG(Object, String, String);
TEST_TOSTRINGTAG(Object, Foo, Foo);
#undef TEST_TOSTRINGTAG
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
