Index: src/ic/x64/handler-compiler-x64.cc |
diff --git a/src/ic/x64/handler-compiler-x64.cc b/src/ic/x64/handler-compiler-x64.cc |
index 43754c32b15a84c16e56232e1d24092e2170cdf2..b7bf9e598e50e920946929ef96e9c74b99abc317 100644 |
--- a/src/ic/x64/handler-compiler-x64.cc |
+++ b/src/ic/x64/handler-compiler-x64.cc |
@@ -115,10 +115,9 @@ static void PushInterceptorArguments(MacroAssembler* masm, Register receiver, |
static void CompileCallLoadPropertyWithInterceptor( |
MacroAssembler* masm, Register receiver, Register holder, Register name, |
- Handle<JSObject> holder_obj, IC::UtilityId id) { |
+ Handle<JSObject> holder_obj, Runtime::FunctionId id) { |
PushInterceptorArguments(masm, receiver, holder, name, holder_obj); |
- __ CallExternalReference(ExternalReference(IC_Utility(id), masm->isolate()), |
- NamedLoadHandlerCompiler::kInterceptorArgsLength); |
+ __ CallRuntime(id, NamedLoadHandlerCompiler::kInterceptorArgsLength); |
} |
@@ -321,8 +320,7 @@ void NamedStoreHandlerCompiler::GenerateSlow(MacroAssembler* masm) { |
StoreIC_PushArgs(masm); |
// Do tail-call to runtime routine. |
- ExternalReference ref(IC_Utility(IC::kStoreIC_Slow), masm->isolate()); |
- __ TailCallExternalReference(ref, 3, 1); |
+ __ TailCallRuntime(Runtime::kStoreIC_Slow, 3, 1); |
} |
@@ -331,8 +329,7 @@ void ElementHandlerCompiler::GenerateStoreSlow(MacroAssembler* masm) { |
StoreIC_PushArgs(masm); |
// Do tail-call to runtime routine. |
- ExternalReference ref(IC_Utility(IC::kKeyedStoreIC_Slow), masm->isolate()); |
- __ TailCallExternalReference(ref, 3, 1); |
+ __ TailCallRuntime(Runtime::kKeyedStoreIC_Slow, 3, 1); |
} |
@@ -671,7 +668,7 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptorWithFollowup( |
// of this method.) |
CompileCallLoadPropertyWithInterceptor( |
masm(), receiver(), holder_reg, this->name(), holder(), |
- IC::kLoadPropertyWithInterceptorOnly); |
+ Runtime::kLoadPropertyWithInterceptorOnly); |
// Check if interceptor provided a value for property. If it's |
// the case, return immediately. |
@@ -705,10 +702,8 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptor(Register holder_reg) { |
holder()); |
__ PushReturnAddressFrom(scratch2()); |
- ExternalReference ref = ExternalReference( |
- IC_Utility(IC::kLoadPropertyWithInterceptor), isolate()); |
- __ TailCallExternalReference( |
- ref, NamedLoadHandlerCompiler::kInterceptorArgsLength, 1); |
+ __ TailCallRuntime(Runtime::kLoadPropertyWithInterceptor, |
+ NamedLoadHandlerCompiler::kInterceptorArgsLength, 1); |
} |
@@ -733,9 +728,7 @@ Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback( |
__ PushReturnAddressFrom(scratch1()); |
// Do tail-call to the runtime system. |
- ExternalReference store_callback_property = |
- ExternalReference(IC_Utility(IC::kStoreCallbackProperty), isolate()); |
- __ TailCallExternalReference(store_callback_property, 5, 1); |
+ __ TailCallRuntime(Runtime::kStoreCallbackProperty, 5, 1); |
// Return the generated code. |
return GetCode(kind(), Code::FAST, name); |
@@ -751,9 +744,7 @@ Handle<Code> NamedStoreHandlerCompiler::CompileStoreInterceptor( |
__ PushReturnAddressFrom(scratch1()); |
// Do tail-call to the runtime system. |
- ExternalReference store_ic_property = ExternalReference( |
- IC_Utility(IC::kStorePropertyWithInterceptor), isolate()); |
- __ TailCallExternalReference(store_ic_property, 3, 1); |
+ __ TailCallRuntime(Runtime::kStorePropertyWithInterceptor, 3, 1); |
// Return the generated code. |
return GetCode(kind(), Code::FAST, name); |