| Index: src/objects.cc
|
| diff --git a/src/objects.cc b/src/objects.cc
|
| index a8cae8cd592d0db59d630e7bb399af31de2c295d..c9d3048f7acd47597a5fc5002c8a9606b3c31106 100644
|
| --- a/src/objects.cc
|
| +++ b/src/objects.cc
|
| @@ -188,7 +188,7 @@ MaybeObject* Object::GetPropertyWithCallback(Object* receiver,
|
| v8::Handle<v8::Value> result;
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| result = call_fun(v8::Utils::ToLocal(key), info);
|
| }
|
| RETURN_IF_SCHEDULED_EXCEPTION();
|
| @@ -1598,7 +1598,7 @@ MaybeObject* JSObject::SetPropertyWithInterceptor(
|
| v8::Handle<v8::Value> result;
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| Handle<Object> value_unhole(value->IsTheHole() ?
|
| isolate->heap()->undefined_value() :
|
| value,
|
| @@ -1664,7 +1664,7 @@ MaybeObject* JSObject::SetPropertyWithCallback(Object* structure,
|
| v8::AccessorInfo info(args.end());
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| call_fun(v8::Utils::ToLocal(key),
|
| v8::Utils::ToLocal(value_handle),
|
| info);
|
| @@ -2120,7 +2120,7 @@ PropertyAttributes JSObject::GetPropertyAttributeWithInterceptor(
|
| v8::Handle<v8::Integer> result;
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| result = query(v8::Utils::ToLocal(name_handle), info);
|
| }
|
| if (!result.IsEmpty()) {
|
| @@ -2134,7 +2134,7 @@ PropertyAttributes JSObject::GetPropertyAttributeWithInterceptor(
|
| v8::Handle<v8::Value> result;
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| result = getter(v8::Utils::ToLocal(name_handle), info);
|
| }
|
| if (!result.IsEmpty()) return DONT_ENUM;
|
| @@ -2507,7 +2507,7 @@ MaybeObject* JSObject::DeletePropertyWithInterceptor(String* name) {
|
| v8::Handle<v8::Boolean> result;
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| result = deleter(v8::Utils::ToLocal(name_handle), info);
|
| }
|
| RETURN_IF_SCHEDULED_EXCEPTION();
|
| @@ -2575,7 +2575,7 @@ MaybeObject* JSObject::DeleteElementWithInterceptor(uint32_t index) {
|
| v8::Handle<v8::Boolean> result;
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| result = deleter(index, info);
|
| }
|
| RETURN_IF_SCHEDULED_EXCEPTION();
|
| @@ -6352,7 +6352,7 @@ bool JSObject::HasElementWithInterceptor(JSObject* receiver, uint32_t index) {
|
| v8::Handle<v8::Integer> result;
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| result = query(index, info);
|
| }
|
| if (!result.IsEmpty()) {
|
| @@ -6366,7 +6366,7 @@ bool JSObject::HasElementWithInterceptor(JSObject* receiver, uint32_t index) {
|
| v8::Handle<v8::Value> result;
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| result = getter(index, info);
|
| }
|
| if (!result.IsEmpty()) return true;
|
| @@ -6525,7 +6525,7 @@ MaybeObject* JSObject::SetElementWithInterceptor(uint32_t index,
|
| v8::Handle<v8::Value> result;
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| result = setter(index, v8::Utils::ToLocal(value_handle), info);
|
| }
|
| RETURN_IF_SCHEDULED_EXCEPTION();
|
| @@ -6561,7 +6561,7 @@ MaybeObject* JSObject::GetElementWithCallback(Object* receiver,
|
| v8::Handle<v8::Value> result;
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| result = call_fun(v8::Utils::ToLocal(key), info);
|
| }
|
| RETURN_IF_SCHEDULED_EXCEPTION();
|
| @@ -6615,7 +6615,7 @@ MaybeObject* JSObject::SetElementWithCallback(Object* structure,
|
| v8::AccessorInfo info(args.end());
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| call_fun(v8::Utils::ToLocal(key),
|
| v8::Utils::ToLocal(value_handle),
|
| info);
|
| @@ -6955,7 +6955,7 @@ MaybeObject* JSObject::GetElementWithInterceptor(JSObject* receiver,
|
| v8::Handle<v8::Value> result;
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| result = getter(index, info);
|
| }
|
| RETURN_IF_SCHEDULED_EXCEPTION();
|
| @@ -7276,7 +7276,7 @@ MaybeObject* JSObject::GetPropertyWithInterceptor(
|
| v8::Handle<v8::Value> result;
|
| {
|
| // Leaving JavaScript.
|
| - VMState state(EXTERNAL);
|
| + VMState state(isolate, EXTERNAL);
|
| result = getter(v8::Utils::ToLocal(name_handle), info);
|
| }
|
| RETURN_IF_SCHEDULED_EXCEPTION();
|
|
|