| Index: src/arm/stub-cache-arm.cc
|
| diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc
|
| index c5abfbb7239934767d732283dfc377a6cb4258f0..7945fb241a9511e54bd6e1fb822c31b1d0baec7b 100644
|
| --- a/src/arm/stub-cache-arm.cc
|
| +++ b/src/arm/stub-cache-arm.cc
|
| @@ -619,11 +619,11 @@ static void PushInterceptorArguments(MacroAssembler* masm,
|
| Register holder,
|
| Register name,
|
| Handle<JSObject> holder_obj) {
|
| - STATIC_ASSERT(StubCache::kInterceptorArgsNameIndex == 0);
|
| - STATIC_ASSERT(StubCache::kInterceptorArgsInfoIndex == 1);
|
| - STATIC_ASSERT(StubCache::kInterceptorArgsThisIndex == 2);
|
| - STATIC_ASSERT(StubCache::kInterceptorArgsHolderIndex == 3);
|
| - STATIC_ASSERT(StubCache::kInterceptorArgsLength == 4);
|
| + STATIC_ASSERT(NamedLoadHandlerCompiler::kInterceptorArgsNameIndex == 0);
|
| + STATIC_ASSERT(NamedLoadHandlerCompiler::kInterceptorArgsInfoIndex == 1);
|
| + STATIC_ASSERT(NamedLoadHandlerCompiler::kInterceptorArgsThisIndex == 2);
|
| + STATIC_ASSERT(NamedLoadHandlerCompiler::kInterceptorArgsHolderIndex == 3);
|
| + STATIC_ASSERT(NamedLoadHandlerCompiler::kInterceptorArgsLength == 4);
|
| __ push(name);
|
| Handle<InterceptorInfo> interceptor(holder_obj->GetNamedInterceptor());
|
| ASSERT(!masm->isolate()->heap()->InNewSpace(*interceptor));
|
| @@ -643,9 +643,8 @@ static void CompileCallLoadPropertyWithInterceptor(
|
| Handle<JSObject> holder_obj,
|
| IC::UtilityId id) {
|
| PushInterceptorArguments(masm, receiver, holder, name, holder_obj);
|
| - __ CallExternalReference(
|
| - ExternalReference(IC_Utility(id), masm->isolate()),
|
| - StubCache::kInterceptorArgsLength);
|
| + __ CallExternalReference(ExternalReference(IC_Utility(id), masm->isolate()),
|
| + NamedLoadHandlerCompiler::kInterceptorArgsLength);
|
| }
|
|
|
|
|
| @@ -1053,7 +1052,8 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptor(
|
| ExternalReference ref =
|
| ExternalReference(IC_Utility(IC::kLoadPropertyWithInterceptor),
|
| isolate());
|
| - __ TailCallExternalReference(ref, StubCache::kInterceptorArgsLength, 1);
|
| + __ TailCallExternalReference(
|
| + ref, NamedLoadHandlerCompiler::kInterceptorArgsLength, 1);
|
| }
|
| }
|
|
|
|
|