Revision: 21555
Author: [email protected]
Date: Wed May 28 09:29:27 2014 UTC
Log: Cleanup GetPropertyWithCallback / SetPropertyWithCallback API
BUG=
[email protected]
Review URL: https://codereview.chromium.org/305513004
http://code.google.com/p/v8/source/detail?r=21555
Modified:
/branches/bleeding_edge/src/objects.cc
/branches/bleeding_edge/src/objects.h
/branches/bleeding_edge/src/runtime.cc
=======================================
--- /branches/bleeding_edge/src/objects.cc Wed May 28 08:39:33 2014 UTC
+++ /branches/bleeding_edge/src/objects.cc Wed May 28 09:29:27 2014 UTC
@@ -361,10 +361,24 @@
}
-MaybeHandle<Object> JSObject::GetPropertyWithCallback(Handle<JSObject>
object,
- Handle<Object>
receiver,
- Handle<Object>
structure,
- Handle<Name> name) {
+MaybeHandle<Object> JSProxy::GetPropertyWithHandler(Handle<JSProxy> proxy,
+ Handle<Object>
receiver,
+ Handle<Name> name) {
+ Isolate* isolate = proxy->GetIsolate();
+
+ // TODO(rossberg): adjust once there is a story for symbols vs proxies.
+ if (name->IsSymbol()) return isolate->factory()->undefined_value();
+
+ Handle<Object> args[] = { receiver, name };
+ return CallTrap(
+ proxy, "get", isolate->derived_get_trap(), ARRAY_SIZE(args), args);
+}
+
+
+MaybeHandle<Object> Object::GetPropertyWithCallback(Handle<Object>
receiver,
+ Handle<Name> name,
+ Handle<JSObject>
holder,
+ Handle<Object>
structure) {
Isolate* isolate = name->GetIsolate();
ASSERT(!structure->IsForeign());
// api style callbacks.
@@ -395,8 +409,8 @@
if (call_fun == NULL) return isolate->factory()->undefined_value();
Handle<String> key = Handle<String>::cast(name);
- LOG(isolate, ApiNamedPropertyAccess("load", *object, *name));
- PropertyCallbackArguments args(isolate, data->data(), *receiver,
*object);
+ LOG(isolate, ApiNamedPropertyAccess("load", *holder, *name));
+ PropertyCallbackArguments args(isolate, data->data(), *receiver,
*holder);
v8::Handle<v8::Value> result =
args.Call(call_fun, v8::Utils::ToLocal(key));
RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object);
@@ -415,29 +429,79 @@
if (getter->IsSpecFunction()) {
// TODO(rossberg): nicer would be to cast to some JSCallable here...
return Object::GetPropertyWithDefinedGetter(
- object, receiver, Handle<JSReceiver>::cast(getter));
+ receiver, Handle<JSReceiver>::cast(getter));
}
// Getter is not a function.
return isolate->factory()->undefined_value();
}
-MaybeHandle<Object> JSProxy::GetPropertyWithHandler(Handle<JSProxy> proxy,
- Handle<Object>
receiver,
- Handle<Name> name) {
- Isolate* isolate = proxy->GetIsolate();
+MaybeHandle<Object> Object::SetPropertyWithCallback(Handle<Object>
receiver,
+ Handle<Name> name,
+ Handle<Object> value,
+ Handle<JSObject>
holder,
+ Handle<Object>
structure,
+ StrictMode
strict_mode) {
+ Isolate* isolate = name->GetIsolate();
- // TODO(rossberg): adjust once there is a story for symbols vs proxies.
- if (name->IsSymbol()) return isolate->factory()->undefined_value();
+ // We should never get here to initialize a const with the hole
+ // value since a const declaration would conflict with the setter.
+ ASSERT(!value->IsTheHole());
+ ASSERT(!structure->IsForeign());
+ if (structure->IsExecutableAccessorInfo()) {
+ // api style callbacks
+ ExecutableAccessorInfo* data =
ExecutableAccessorInfo::cast(*structure);
+ if (!data->IsCompatibleReceiver(*receiver)) {
+ Handle<Object> args[2] = { name, receiver };
+ Handle<Object> error =
+ isolate->factory()->NewTypeError("incompatible_method_receiver",
+ HandleVector(args,
+ ARRAY_SIZE(args)));
+ return isolate->Throw<Object>(error);
+ }
+ // TODO(rossberg): Support symbols in the API.
+ if (name->IsSymbol()) return value;
+ Object* call_obj = data->setter();
+ v8::AccessorSetterCallback call_fun =
+ v8::ToCData<v8::AccessorSetterCallback>(call_obj);
+ if (call_fun == NULL) return value;
+ Handle<String> key = Handle<String>::cast(name);
+ LOG(isolate, ApiNamedPropertyAccess("store", *holder, *name));
+ PropertyCallbackArguments args(isolate, data->data(), *receiver,
*holder);
+ args.Call(call_fun,
+ v8::Utils::ToLocal(key),
+ v8::Utils::ToLocal(value));
+ RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object);
+ return value;
+ }
- Handle<Object> args[] = { receiver, name };
- return CallTrap(
- proxy, "get", isolate->derived_get_trap(), ARRAY_SIZE(args), args);
+ if (structure->IsAccessorPair()) {
+ Handle<Object> setter(AccessorPair::cast(*structure)->setter(),
isolate);
+ if (setter->IsSpecFunction()) {
+ // TODO(rossberg): nicer would be to cast to some JSCallable here...
+ return SetPropertyWithDefinedSetter(
+ receiver, Handle<JSReceiver>::cast(setter), value);
+ } else {
+ if (strict_mode == SLOPPY) return value;
+ Handle<Object> args[2] = { name, holder };
+ Handle<Object> error =
+ isolate->factory()->NewTypeError("no_setter_in_callback",
+ HandleVector(args, 2));
+ return isolate->Throw<Object>(error);
+ }
+ }
+
+ // TODO(dcarney): Handle correctly.
+ if (structure->IsDeclaredAccessorInfo()) {
+ return value;
+ }
+
+ UNREACHABLE();
+ return MaybeHandle<Object>();
}
MaybeHandle<Object> Object::GetPropertyWithDefinedGetter(
- Handle<Object> object,
Handle<Object> receiver,
Handle<JSReceiver> getter) {
Isolate* isolate = getter->GetIsolate();
@@ -451,6 +515,29 @@
return Execution::Call(isolate, getter, receiver, 0, NULL, true);
}
+
+
+MaybeHandle<Object> Object::SetPropertyWithDefinedSetter(
+ Handle<Object> receiver,
+ Handle<JSReceiver> setter,
+ Handle<Object> value) {
+ Isolate* isolate = setter->GetIsolate();
+
+ Debug* debug = isolate->debug();
+ // Handle stepping into a setter if step into is active.
+ // TODO(rossberg): should this apply to getters that are function
proxies?
+ if (debug->StepInActive() && setter->IsJSFunction()) {
+ debug->HandleStepIn(
+ Handle<JSFunction>::cast(setter), Handle<Object>::null(), 0,
false);
+ }
+
+ Handle<Object> argv[] = { value };
+ RETURN_ON_EXCEPTION(
+ isolate,
+ Execution::Call(isolate, setter, receiver, ARRAY_SIZE(argv), argv),
+ Object);
+ return value;
+}
// Only deal with CALLBACKS and INTERCEPTOR
@@ -477,7 +564,7 @@
break;
}
Handle<JSObject> holder(result->holder(), isolate);
- return GetPropertyWithCallback(holder, receiver, callback_obj,
name);
+ return GetPropertyWithCallback(receiver, name, holder,
callback_obj);
}
case NORMAL:
case FIELD:
@@ -791,11 +878,9 @@
case CONSTANT:
return handle(result->GetConstant(), isolate);
case CALLBACKS:
- return JSObject::GetPropertyWithCallback(
- handle(result->holder(), isolate),
- receiver,
- handle(result->GetCallbackObject(), isolate),
- name);
+ return GetPropertyWithCallback(
+ receiver, name, handle(result->holder(), isolate),
+ handle(result->GetCallbackObject(), isolate));
case HANDLER:
return JSProxy::GetPropertyWithHandler(
handle(result->proxy(), isolate), receiver, name);
@@ -3005,94 +3090,6 @@
}
-MaybeHandle<Object> JSObject::SetPropertyWithCallback(Handle<JSObject>
object,
- Handle<Object>
structure,
- Handle<Name> name,
- Handle<Object> value,
- Handle<JSObject>
holder,
- StrictMode
strict_mode) {
- Isolate* isolate = object->GetIsolate();
-
- // We should never get here to initialize a const with the hole
- // value since a const declaration would conflict with the setter.
- ASSERT(!value->IsTheHole());
- ASSERT(!structure->IsForeign());
- if (structure->IsExecutableAccessorInfo()) {
- // api style callbacks
- ExecutableAccessorInfo* data =
ExecutableAccessorInfo::cast(*structure);
- if (!data->IsCompatibleReceiver(*object)) {
- Handle<Object> args[2] = { name, object };
- Handle<Object> error =
- isolate->factory()->NewTypeError("incompatible_method_receiver",
- HandleVector(args,
- ARRAY_SIZE(args)));
- return isolate->Throw<Object>(error);
- }
- // TODO(rossberg): Support symbols in the API.
- if (name->IsSymbol()) return value;
- Object* call_obj = data->setter();
- v8::AccessorSetterCallback call_fun =
- v8::ToCData<v8::AccessorSetterCallback>(call_obj);
- if (call_fun == NULL) return value;
- Handle<String> key = Handle<String>::cast(name);
- LOG(isolate, ApiNamedPropertyAccess("store", *object, *name));
- PropertyCallbackArguments args(isolate, data->data(), *object,
*holder);
- args.Call(call_fun,
- v8::Utils::ToLocal(key),
- v8::Utils::ToLocal(value));
- RETURN_EXCEPTION_IF_SCHEDULED_EXCEPTION(isolate, Object);
- return value;
- }
-
- if (structure->IsAccessorPair()) {
- Handle<Object> setter(AccessorPair::cast(*structure)->setter(),
isolate);
- if (setter->IsSpecFunction()) {
- // TODO(rossberg): nicer would be to cast to some JSCallable here...
- return SetPropertyWithDefinedSetter(
- object, Handle<JSReceiver>::cast(setter), value);
- } else {
- if (strict_mode == SLOPPY) return value;
- Handle<Object> args[2] = { name, holder };
- Handle<Object> error =
- isolate->factory()->NewTypeError("no_setter_in_callback",
- HandleVector(args, 2));
- return isolate->Throw<Object>(error);
- }
- }
-
- // TODO(dcarney): Handle correctly.
- if (structure->IsDeclaredAccessorInfo()) {
- return value;
- }
-
- UNREACHABLE();
- return MaybeHandle<Object>();
-}
-
-
-MaybeHandle<Object> JSReceiver::SetPropertyWithDefinedSetter(
- Handle<JSReceiver> object,
- Handle<JSReceiver> setter,
- Handle<Object> value) {
- Isolate* isolate = object->GetIsolate();
-
- Debug* debug = isolate->debug();
- // Handle stepping into a setter if step into is active.
- // TODO(rossberg): should this apply to getters that are function
proxies?
- if (debug->StepInActive() && setter->IsJSFunction()) {
- debug->HandleStepIn(
- Handle<JSFunction>::cast(setter), Handle<Object>::null(), 0,
false);
- }
-
- Handle<Object> argv[] = { value };
- RETURN_ON_EXCEPTION(
- isolate,
- Execution::Call(isolate, setter, object, ARRAY_SIZE(argv), argv),
- Object);
- return value;
-}
-
-
MaybeHandle<Object> JSObject::SetElementWithCallbackSetterInPrototypes(
Handle<JSObject> object,
uint32_t index,
@@ -3166,8 +3163,9 @@
*done = true;
if (!result.IsReadOnly()) {
Handle<Object> callback_object(result.GetCallbackObject(),
isolate);
- return SetPropertyWithCallback(object, callback_object, name,
value,
- handle(result.holder()),
strict_mode);
+ return SetPropertyWithCallback(object, name, value,
+ handle(result.holder()),
+ callback_object, strict_mode);
}
break;
}
@@ -3625,22 +3623,16 @@
if (obj->IsAccessorInfo()) {
Handle<AccessorInfo> info(AccessorInfo::cast(obj));
if (info->all_can_write()) {
- return SetPropertyWithCallback(object,
- info,
- name,
- value,
+ return SetPropertyWithCallback(object, name, value,
handle(result->holder()),
- strict_mode);
+ info, strict_mode);
}
} else if (obj->IsAccessorPair()) {
Handle<AccessorPair> pair(AccessorPair::cast(obj));
if (pair->all_can_read()) {
- return SetPropertyWithCallback(object,
- pair,
- name,
- value,
+ return SetPropertyWithCallback(object, name, value,
handle(result->holder()),
- strict_mode);
+ pair, strict_mode);
}
}
break;
@@ -4300,8 +4292,9 @@
break;
case CALLBACKS: {
Handle<Object> callback_object(lookup->GetCallbackObject(),
isolate);
- return SetPropertyWithCallback(object, callback_object, name,
value,
- handle(lookup->holder()),
strict_mode);
+ return SetPropertyWithCallback(object, name, value,
+ handle(lookup->holder()),
+ callback_object, strict_mode);
}
case INTERCEPTOR:
maybe_result = SetPropertyWithInterceptor(
@@ -12581,7 +12574,7 @@
if (getter->IsSpecFunction()) {
// TODO(rossberg): nicer would be to cast to some JSCallable here...
return GetPropertyWithDefinedGetter(
- object, receiver, Handle<JSReceiver>::cast(getter));
+ receiver, Handle<JSReceiver>::cast(getter));
}
// Getter is not a function.
return isolate->factory()->undefined_value();
=======================================
--- /branches/bleeding_edge/src/objects.h Tue May 27 14:55:29 2014 UTC
+++ /branches/bleeding_edge/src/objects.h Wed May 28 09:29:27 2014 UTC
@@ -1477,10 +1477,26 @@
Handle<Name> key,
PropertyAttributes* attributes);
+ MUST_USE_RESULT static MaybeHandle<Object> GetPropertyWithCallback(
+ Handle<Object> receiver,
+ Handle<Name> name,
+ Handle<JSObject> holder,
+ Handle<Object> structure);
+ MUST_USE_RESULT static MaybeHandle<Object> SetPropertyWithCallback(
+ Handle<Object> receiver,
+ Handle<Name> name,
+ Handle<Object> value,
+ Handle<JSObject> holder,
+ Handle<Object> structure,
+ StrictMode strict_mode);
+
MUST_USE_RESULT static MaybeHandle<Object> GetPropertyWithDefinedGetter(
- Handle<Object> object,
Handle<Object> receiver,
Handle<JSReceiver> getter);
+ MUST_USE_RESULT static MaybeHandle<Object> SetPropertyWithDefinedSetter(
+ Handle<Object> receiver,
+ Handle<JSReceiver> setter,
+ Handle<Object> value);
MUST_USE_RESULT static inline MaybeHandle<Object> GetElement(
Isolate* isolate,
@@ -1994,12 +2010,6 @@
Handle<JSReceiver> object,
KeyCollectionType type);
- protected:
- MUST_USE_RESULT static MaybeHandle<Object> SetPropertyWithDefinedSetter(
- Handle<JSReceiver> object,
- Handle<JSReceiver> setter,
- Handle<Object> value);
-
private:
static PropertyAttributes GetPropertyAttributeForResult(
Handle<JSReceiver> object,
@@ -2128,20 +2138,6 @@
static Handle<Object> PrepareSlowElementsForSort(Handle<JSObject> object,
uint32_t limit);
- MUST_USE_RESULT static MaybeHandle<Object> GetPropertyWithCallback(
- Handle<JSObject> object,
- Handle<Object> receiver,
- Handle<Object> structure,
- Handle<Name> name);
-
- MUST_USE_RESULT static MaybeHandle<Object> SetPropertyWithCallback(
- Handle<JSObject> object,
- Handle<Object> structure,
- Handle<Name> name,
- Handle<Object> value,
- Handle<JSObject> holder,
- StrictMode strict_mode);
-
MUST_USE_RESULT static MaybeHandle<Object> SetPropertyWithInterceptor(
Handle<JSObject> object,
Handle<Name> name,
=======================================
--- /branches/bleeding_edge/src/runtime.cc Wed May 28 08:35:16 2014 UTC
+++ /branches/bleeding_edge/src/runtime.cc Wed May 28 09:29:27 2014 UTC
@@ -5188,12 +5188,9 @@
Handle<Object> result_object;
ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
isolate, result_object,
- JSObject::SetPropertyWithCallback(js_object,
- callback,
- name,
- obj_value,
+ JSObject::SetPropertyWithCallback(js_object, name, obj_value,
handle(lookup.holder()),
- STRICT));
+ callback, STRICT));
return *result_object;
}
}
@@ -10789,7 +10786,7 @@
ASSERT(!structure->IsForeign());
if (structure->IsAccessorInfo()) {
MaybeHandle<Object> obj = JSObject::GetPropertyWithCallback(
- handle(result->holder(), isolate), receiver, structure, name);
+ receiver, name, handle(result->holder(), isolate), structure);
if (!obj.ToHandle(&value)) {
value = handle(isolate->pending_exception(), isolate);
isolate->clear_pending_exception();
--
--
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.
