Unify runtime-style IC functions with Runtime intrinsics

src/ic/x64/handler-compiler-x64.cc

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..b1511ed19cf80961f4c12953fdd22f55ff96f72f 100644
--- a/src/ic/x64/handler-compiler-x64.cc
+++ b/src/ic/x64/handler-compiler-x64.cc
@@ -115,10 +115,11 @@ 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);
+  __ CallExternalReference(
+      ExternalReference(Runtime::FunctionForId(id), masm->isolate()),
+      NamedLoadHandlerCompiler::kInterceptorArgsLength);
 }
 
 
@@ -321,7 +322,8 @@ void NamedStoreHandlerCompiler::GenerateSlow(MacroAssembler* masm) {
   StoreIC_PushArgs(masm);
 
   // Do tail-call to runtime routine.
-  ExternalReference ref(IC_Utility(IC::kStoreIC_Slow), masm->isolate());
+  ExternalReference ref(Runtime::FunctionForId(Runtime::kStoreIC_Slow),
+                        masm->isolate());
   __ TailCallExternalReference(ref, 3, 1);
 }
 
@@ -331,7 +333,8 @@ void ElementHandlerCompiler::GenerateStoreSlow(MacroAssembler* masm) {
   StoreIC_PushArgs(masm);
 
   // Do tail-call to runtime routine.
-  ExternalReference ref(IC_Utility(IC::kKeyedStoreIC_Slow), masm->isolate());
+  ExternalReference ref(Runtime::FunctionForId(Runtime::kKeyedStoreIC_Slow),
+                        masm->isolate());
   __ TailCallExternalReference(ref, 3, 1);
 }
 
@@ -671,7 +674,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.
@@ -706,7 +709,7 @@ void NamedLoadHandlerCompiler::GenerateLoadInterceptor(Register holder_reg) {
   __ PushReturnAddressFrom(scratch2());
 
   ExternalReference ref = ExternalReference(
-      IC_Utility(IC::kLoadPropertyWithInterceptor), isolate());
+      Runtime::FunctionForId(Runtime::kLoadPropertyWithInterceptor), isolate());
   __ TailCallExternalReference(
       ref, NamedLoadHandlerCompiler::kInterceptorArgsLength, 1);
 }
@@ -733,8 +736,8 @@ Handle<Code> NamedStoreHandlerCompiler::CompileStoreCallback(
   __ PushReturnAddressFrom(scratch1());
 
   // Do tail-call to the runtime system.
-  ExternalReference store_callback_property =
-      ExternalReference(IC_Utility(IC::kStoreCallbackProperty), isolate());
+  ExternalReference store_callback_property = ExternalReference(
+      Runtime::FunctionForId(Runtime::kStoreCallbackProperty), isolate());
   __ TailCallExternalReference(store_callback_property, 5, 1);
 
   // Return the generated code.
@@ -752,7 +755,8 @@ Handle<Code> NamedStoreHandlerCompiler::CompileStoreInterceptor(
 
   // Do tail-call to the runtime system.
   ExternalReference store_ic_property = ExternalReference(
-      IC_Utility(IC::kStorePropertyWithInterceptor), isolate());
+      Runtime::FunctionForId(Runtime::kStorePropertyWithInterceptor),
+      isolate());
   __ TailCallExternalReference(store_ic_property, 3, 1);
 
   // Return the generated code.