Commit 47f64a76 authored by verwaest's avatar verwaest Committed by Commit bot

Inline fast-path interceptor access in the IC utilities

BUG=

Committed: https://crrev.com/b3bda50ddd9e30b718ae7972d9dd0d095113f634
Cr-Commit-Position: refs/heads/master@{#34892}

Review URL: https://codereview.chromium.org/1810083003

Cr-Commit-Position: refs/heads/master@{#34944}
parent 6734df93
...@@ -1422,7 +1422,8 @@ bool StoreIC::LookupForWrite(LookupIterator* it, Handle<Object> value, ...@@ -1422,7 +1422,8 @@ bool StoreIC::LookupForWrite(LookupIterator* it, Handle<Object> value,
Handle<JSObject> holder = it->GetHolder<JSObject>(); Handle<JSObject> holder = it->GetHolder<JSObject>();
InterceptorInfo* info = holder->GetNamedInterceptor(); InterceptorInfo* info = holder->GetNamedInterceptor();
if (it->HolderIsReceiverOrHiddenPrototype()) { if (it->HolderIsReceiverOrHiddenPrototype()) {
if (!info->setter()->IsUndefined()) return true; return !info->non_masking() && receiver.is_identical_to(holder) &&
!info->setter()->IsUndefined();
} else if (!info->getter()->IsUndefined() || } else if (!info->getter()->IsUndefined() ||
!info->query()->IsUndefined()) { !info->query()->IsUndefined()) {
return false; return false;
...@@ -2807,11 +2808,8 @@ RUNTIME_FUNCTION(Runtime_LoadPropertyWithInterceptorOnly) { ...@@ -2807,11 +2808,8 @@ RUNTIME_FUNCTION(Runtime_LoadPropertyWithInterceptorOnly) {
RETURN_FAILURE_IF_SCHEDULED_EXCEPTION(isolate); RETURN_FAILURE_IF_SCHEDULED_EXCEPTION(isolate);
Handle<Object> result_internal; if (!result.is_null()) return *result;
if (result.is_null()) { return isolate->heap()->no_interceptor_result_sentinel();
return isolate->heap()->no_interceptor_result_sentinel();
}
return *result;
} }
...@@ -2829,15 +2827,32 @@ RUNTIME_FUNCTION(Runtime_LoadPropertyWithInterceptor) { ...@@ -2829,15 +2827,32 @@ RUNTIME_FUNCTION(Runtime_LoadPropertyWithInterceptor) {
Handle<JSObject> holder = Handle<JSObject> holder =
args.at<JSObject>(NamedLoadHandlerCompiler::kInterceptorArgsHolderIndex); args.at<JSObject>(NamedLoadHandlerCompiler::kInterceptorArgsHolderIndex);
Handle<Object> result; InterceptorInfo* interceptor = holder->GetNamedInterceptor();
PropertyCallbackArguments arguments(isolate, interceptor->data(), *receiver,
*holder, Object::DONT_THROW);
v8::GenericNamedPropertyGetterCallback getter =
v8::ToCData<v8::GenericNamedPropertyGetterCallback>(
interceptor->getter());
Handle<Object> result = arguments.Call(getter, name);
RETURN_FAILURE_IF_SCHEDULED_EXCEPTION(isolate);
if (!result.is_null()) return *result;
LookupIterator it(receiver, name, holder); LookupIterator it(receiver, name, holder);
// TODO(conradw): Investigate strong mode semantics for this. // Skip any lookup work until we hit the (possibly non-masking) interceptor.
while (it.state() != LookupIterator::INTERCEPTOR ||
!it.GetHolder<JSObject>().is_identical_to(holder)) {
DCHECK(it.state() != LookupIterator::ACCESS_CHECK || it.HasAccess());
it.Next();
}
// Skip past the interceptor.
it.Next();
ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, result, Object::GetProperty(&it)); ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, result, Object::GetProperty(&it));
if (it.IsFound()) return *result; if (it.IsFound()) return *result;
// Return the undefined result if the reference error should not be thrown.
// Note that both keyed and non-keyed loads may end up here.
LoadICNexus nexus(isolate); LoadICNexus nexus(isolate);
LoadIC ic(IC::NO_EXTRA_FRAME, isolate, &nexus); LoadIC ic(IC::NO_EXTRA_FRAME, isolate, &nexus);
if (!ic.ShouldThrowReferenceError(it.GetReceiver())) { if (!ic.ShouldThrowReferenceError(it.GetReceiver())) {
...@@ -2858,26 +2873,34 @@ RUNTIME_FUNCTION(Runtime_StorePropertyWithInterceptor) { ...@@ -2858,26 +2873,34 @@ RUNTIME_FUNCTION(Runtime_StorePropertyWithInterceptor) {
Handle<JSObject> receiver = args.at<JSObject>(0); Handle<JSObject> receiver = args.at<JSObject>(0);
Handle<Name> name = args.at<Name>(1); Handle<Name> name = args.at<Name>(1);
Handle<Object> value = args.at<Object>(2); Handle<Object> value = args.at<Object>(2);
#ifdef DEBUG
PrototypeIterator iter(isolate, receiver, DCHECK(receiver->HasNamedInterceptor());
PrototypeIterator::START_AT_RECEIVER, InterceptorInfo* interceptor = receiver->GetNamedInterceptor();
PrototypeIterator::END_AT_NON_HIDDEN); DCHECK(!interceptor->non_masking());
bool found = false; PropertyCallbackArguments arguments(isolate, interceptor->data(), *receiver,
for (; !iter.IsAtEnd(); iter.Advance()) { *receiver, Object::DONT_THROW);
Handle<Object> current = PrototypeIterator::GetCurrent(iter);
if (current->IsJSObject() && v8::GenericNamedPropertySetterCallback setter =
Handle<JSObject>::cast(current)->HasNamedInterceptor()) { v8::ToCData<v8::GenericNamedPropertySetterCallback>(
found = true; interceptor->setter());
break; Handle<Object> result = arguments.Call(setter, name, value);
} RETURN_FAILURE_IF_SCHEDULED_EXCEPTION(isolate);
if (!result.is_null()) return *value;
LookupIterator it(receiver, name, receiver);
// Skip past any access check on the receiver.
if (it.state() == LookupIterator::ACCESS_CHECK) {
DCHECK(it.HasAccess());
it.Next();
} }
DCHECK(found); // Skip past the interceptor on the receiver.
#endif DCHECK_EQ(LookupIterator::INTERCEPTOR, it.state());
Handle<Object> result; it.Next();
ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
isolate, result, MAYBE_RETURN(Object::SetProperty(&it, value, ic.language_mode(),
JSObject::SetProperty(receiver, name, value, ic.language_mode())); JSReceiver::CERTAINLY_NOT_STORE_FROM_KEYED),
return *result; isolate->heap()->exception());
return *value;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment