Index: src/objects.cc |
diff --git a/src/objects.cc b/src/objects.cc |
index 22f72465ab6356d10caffaabdfe2aff220351f6c..00ba82fab701acb0fd75b2bce383de093e7f3826 100644 |
--- a/src/objects.cc |
+++ b/src/objects.cc |
@@ -1364,8 +1364,8 @@ MaybeHandle<Object> Object::GetPropertyWithAccessor(LookupIterator* it) { |
DCHECK(!structure->IsForeign()); |
// API style callbacks. |
+ Handle<JSObject> holder = it->GetHolder<JSObject>(); |
if (structure->IsAccessorInfo()) { |
- Handle<JSObject> holder = it->GetHolder<JSObject>(); |
Handle<Name> name = it->GetName(); |
Handle<AccessorInfo> info = Handle<AccessorInfo>::cast(structure); |
if (!info->IsCompatibleReceiver(*receiver)) { |
@@ -1408,6 +1408,8 @@ MaybeHandle<Object> Object::GetPropertyWithAccessor(LookupIterator* it) { |
// Regular accessor. |
Handle<Object> getter(AccessorPair::cast(*structure)->getter(), isolate); |
if (getter->IsFunctionTemplateInfo()) { |
+ SaveContext save(isolate); |
+ isolate->set_context(*holder->GetCreationContext()); |
return Builtins::InvokeApiFunction( |
isolate, false, Handle<FunctionTemplateInfo>::cast(getter), receiver, 0, |
nullptr, isolate->factory()->undefined_value()); |
@@ -1456,8 +1458,8 @@ Maybe<bool> Object::SetPropertyWithAccessor(LookupIterator* it, |
DCHECK(!structure->IsForeign()); |
// API style callbacks. |
+ Handle<JSObject> holder = it->GetHolder<JSObject>(); |
if (structure->IsAccessorInfo()) { |
- Handle<JSObject> holder = it->GetHolder<JSObject>(); |
Handle<Name> name = it->GetName(); |
Handle<AccessorInfo> info = Handle<AccessorInfo>::cast(structure); |
if (!info->IsCompatibleReceiver(*receiver)) { |
@@ -1503,6 +1505,8 @@ Maybe<bool> Object::SetPropertyWithAccessor(LookupIterator* it, |
// Regular accessor. |
Handle<Object> setter(AccessorPair::cast(*structure)->setter(), isolate); |
if (setter->IsFunctionTemplateInfo()) { |
+ SaveContext save(isolate); |
+ isolate->set_context(*holder->GetCreationContext()); |
Handle<Object> argv[] = {value}; |
RETURN_ON_EXCEPTION_VALUE( |
isolate, Builtins::InvokeApiFunction( |