Revision: 16844
Author: [email protected]
Date: Thu Sep 19 17:03:32 2013 UTC
Log: Handlify JSReceiver::SetPropertyWithDefinedSetter method.
[email protected]
Review URL: https://codereview.chromium.org/24176002
http://code.google.com/p/v8/source/detail?r=16844
Modified:
/branches/bleeding_edge/src/objects.cc
/branches/bleeding_edge/src/objects.h
=======================================
--- /branches/bleeding_edge/src/objects.cc Thu Sep 19 09:48:50 2013 UTC
+++ /branches/bleeding_edge/src/objects.cc Thu Sep 19 17:03:32 2013 UTC
@@ -2814,10 +2814,8 @@
Handle<Object> setter(AccessorPair::cast(*structure)->setter(),
isolate);
if (setter->IsSpecFunction()) {
// TODO(rossberg): nicer would be to cast to some JSCallable here...
- CALL_HEAP_FUNCTION(isolate,
- object->SetPropertyWithDefinedSetter(
- JSReceiver::cast(*setter), *value),
- Object);
+ return SetPropertyWithDefinedSetter(
+ object, Handle<JSReceiver>::cast(setter), value);
} else {
if (strict_mode == kNonStrictMode) {
return value;
@@ -2841,28 +2839,29 @@
}
-MaybeObject* JSReceiver::SetPropertyWithDefinedSetter(JSReceiver* setter,
- Object* value) {
- Isolate* isolate = GetIsolate();
- Handle<Object> value_handle(value, isolate);
- Handle<JSReceiver> fun(setter, isolate);
- Handle<JSReceiver> self(this, isolate);
+Handle<Object> JSReceiver::SetPropertyWithDefinedSetter(
+ Handle<JSReceiver> object,
+ Handle<JSReceiver> setter,
+ Handle<Object> value) {
+ Isolate* isolate = object->GetIsolate();
+
#ifdef ENABLE_DEBUGGER_SUPPORT
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() && fun->IsJSFunction()) {
+ if (debug->StepInActive() && setter->IsJSFunction()) {
debug->HandleStepIn(
- Handle<JSFunction>::cast(fun), Handle<Object>::null(), 0, false);
+ Handle<JSFunction>::cast(setter), Handle<Object>::null(), 0,
false);
}
#endif
+
bool has_pending_exception;
- Handle<Object> argv[] = { value_handle };
+ Handle<Object> argv[] = { value };
Execution::Call(
- isolate, fun, self, ARRAY_SIZE(argv), argv, &has_pending_exception);
+ isolate, setter, object, ARRAY_SIZE(argv), argv,
&has_pending_exception);
// Check for pending exception and return the result.
- if (has_pending_exception) return Failure::Exception();
- return *value_handle;
+ if (has_pending_exception) return Handle<Object>();
+ return value;
}
@@ -3535,10 +3534,8 @@
ASSERT(!isolate->has_pending_exception());
if (!setter->IsUndefined()) {
// TODO(rossberg): nicer would be to cast to some JSCallable here...
- CALL_HEAP_FUNCTION(isolate,
- receiver->SetPropertyWithDefinedSetter(
- JSReceiver::cast(*setter), *value),
- Object);
+ return SetPropertyWithDefinedSetter(
+ receiver, Handle<JSReceiver>::cast(setter), value);
}
if (strict_mode == kNonStrictMode) return value;
@@ -11701,10 +11698,8 @@
Handle<Object> setter(AccessorPair::cast(*structure)->setter(),
isolate);
if (setter->IsSpecFunction()) {
// TODO(rossberg): nicer would be to cast to some JSCallable here...
- CALL_HEAP_FUNCTION(isolate,
- object->SetPropertyWithDefinedSetter(
- JSReceiver::cast(*setter), *value),
- Object);
+ return SetPropertyWithDefinedSetter(
+ object, Handle<JSReceiver>::cast(setter), value);
} else {
if (strict_mode == kNonStrictMode) {
return value;
=======================================
--- /branches/bleeding_edge/src/objects.h Thu Sep 19 14:13:34 2013 UTC
+++ /branches/bleeding_edge/src/objects.h Thu Sep 19 17:03:32 2013 UTC
@@ -1964,9 +1964,6 @@
PropertyAttributes attributes,
StrictModeFlag strict_mode);
- MUST_USE_RESULT MaybeObject* SetPropertyWithDefinedSetter(JSReceiver*
setter,
- Object* value);
-
// Implementation of [[HasProperty]], ECMA-262 5th edition, section
8.12.6.
static inline bool HasProperty(Handle<JSReceiver> object, Handle<Name>
name);
static inline bool HasLocalProperty(Handle<JSReceiver>, Handle<Name>
name);
@@ -2018,6 +2015,10 @@
protected:
Smi* GenerateIdentityHash();
+ static Handle<Object> SetPropertyWithDefinedSetter(Handle<JSReceiver>
object,
+ Handle<JSReceiver>
setter,
+ Handle<Object> value);
+
private:
PropertyAttributes GetPropertyAttributeForResult(JSReceiver* receiver,
LookupResult* result,
--
--
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/groups/opt_out.
