Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(759)

Unified Diff: src/objects.cc

Issue 1476403004: Remove Object::IsSpecObject, use Object::IsJSReceiver instead. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Rebase. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/objects.h ('k') | src/objects-inl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index 554473e9910ebd89af02e186a4d4478c1b8f129c..9626e6096d2b3465cac858f77e031e8a919ffa37 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -858,7 +858,7 @@ MaybeHandle<Object> JSProxy::GetPrototype(Handle<JSProxy> proxy) {
Handle<Object> raw_handler(proxy->handler(), isolate);
// 2. If handler is null, throw a TypeError exception.
// 3. Assert: Type(handler) is Object.
- if (!raw_handler->IsSpecObject()) {
+ if (!raw_handler->IsJSReceiver()) {
// TODO(cbruni): Throw correct error message.
THROW_NEW_ERROR(
isolate, NewTypeError(MessageTemplate::kProxyHandlerNonObject), Object);
@@ -883,7 +883,7 @@ MaybeHandle<Object> JSProxy::GetPrototype(Handle<JSProxy> proxy) {
isolate, handler_proto,
Execution::Call(isolate, trap, handler, arraysize(argv), argv), Object);
// 8. If Type(handlerProto) is neither Object nor Null, throw a TypeError.
- if (!(handler_proto->IsSpecObject() || handler_proto->IsNull())) {
+ if (!(handler_proto->IsJSReceiver() || handler_proto->IsNull())) {
THROW_NEW_ERROR(isolate,
NewTypeError(MessageTemplate::kProxyHandlerTrapMissing,
handler, trap_name),
@@ -6086,7 +6086,7 @@ Object* JSReceiver::DefineProperty(Isolate* isolate, Handle<Object> object,
Handle<Object> key,
Handle<Object> attributes) {
// 1. If Type(O) is not Object, throw a TypeError exception.
- if (!object->IsSpecObject()) {
+ if (!object->IsJSReceiver()) {
Handle<String> fun_name =
isolate->factory()->InternalizeUtf8String("Object.defineProperty");
THROW_NEW_ERROR_RETURN_FAILURE(
@@ -6117,7 +6117,7 @@ Object* JSReceiver::DefineProperty(Isolate* isolate, Handle<Object> object,
Object* JSReceiver::DefineProperties(Isolate* isolate, Handle<Object> object,
Handle<Object> properties) {
// 1. If Type(O) is not Object, throw a TypeError exception.
- if (!object->IsSpecObject()) {
+ if (!object->IsJSReceiver()) {
Handle<String> fun_name =
isolate->factory()->InternalizeUtf8String("Object.defineProperties");
THROW_NEW_ERROR_RETURN_FAILURE(
@@ -6798,7 +6798,7 @@ bool JSProxy::DefineOwnProperty(Isolate* isolate, Handle<JSProxy> proxy,
// 4. Assert: Type(handler) is Object.
DCHECK(handler->IsJSReceiver());
// If the handler is not null, the target can't be null either.
- DCHECK(proxy->target()->IsSpecObject());
+ DCHECK(proxy->target()->IsJSReceiver());
// 5. Let target be the value of the [[ProxyTarget]] internal slot of O.
Handle<JSReceiver> target(JSReceiver::cast(proxy->target()), isolate);
// 6. Let trap be ? GetMethod(handler, "defineProperty").
@@ -6981,9 +6981,9 @@ bool JSProxy::GetOwnPropertyDescriptor(LookupIterator* it,
return false;
}
// 4. Assert: Type(handler) is Object.
- DCHECK(handler->IsSpecObject());
+ DCHECK(handler->IsJSReceiver());
// If the handler is not null, the target can't be null either.
- DCHECK(it->GetHolder<JSProxy>()->target()->IsSpecObject());
+ DCHECK(it->GetHolder<JSProxy>()->target()->IsJSReceiver());
// 5. Let target be the value of the [[ProxyTarget]] internal slot of O.
Handle<JSReceiver> target(
JSReceiver::cast(it->GetHolder<JSProxy>()->target()), isolate);
@@ -7006,7 +7006,7 @@ bool JSProxy::GetOwnPropertyDescriptor(LookupIterator* it,
Execution::Call(isolate, trap, handler, arraysize(args), args), false);
// 9. If Type(trapResultObj) is neither Object nor Undefined, throw a
// TypeError exception.
- if (!trap_result_obj->IsSpecObject() && !trap_result_obj->IsUndefined()) {
+ if (!trap_result_obj->IsJSReceiver() && !trap_result_obj->IsUndefined()) {
isolate->Throw(*isolate->factory()->NewTypeError(
MessageTemplate::kProxyHandlerReturned, handler, trap_result_obj,
property_name));
« no previous file with comments | « src/objects.h ('k') | src/objects-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698