Index: src/objects.cc |
diff --git a/src/objects.cc b/src/objects.cc |
index a63255a931090e60b01e5caf48e2747cdc9a7c97..b2f614fd3fa65babd7f2bbe3c6d608f06c6c7843 100644 |
--- a/src/objects.cc |
+++ b/src/objects.cc |
@@ -1369,8 +1369,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)) { |
@@ -1413,6 +1413,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()); |
@@ -1461,8 +1463,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)) { |
@@ -1508,6 +1510,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( |