Unify runtime-style IC functions with Runtime intrinsics

src/x64/code-stubs-x64.cc

Index: src/x64/code-stubs-x64.cc
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
index 45f2ae30dbebd1beac1d75922185699ca12ba45c..63d26e7015a0ae23bd22c682b27a0a49b7a1351d 100644
--- a/src/x64/code-stubs-x64.cc
+++ b/src/x64/code-stubs-x64.cc
@@ -889,8 +889,9 @@ void LoadIndexedInterceptorStub::Generate(MacroAssembler* masm) {
 
   // Perform tail call to the entry.
   __ TailCallExternalReference(
-      ExternalReference(IC_Utility(IC::kLoadElementWithInterceptor),
-                        masm->isolate()),
+      ExternalReference(
+          Runtime::FunctionForId(Runtime::kLoadElementWithInterceptor),
+          masm->isolate()),
       2, 1);
 
   __ bind(&slow);
@@ -2330,10 +2331,12 @@ void CallICStub::GenerateMiss(MacroAssembler* masm) {
   __ Push(rdx);
 
   // Call the entry.
-  IC::UtilityId id = GetICState() == DEFAULT ? IC::kCallIC_Miss
-                                             : IC::kCallIC_Customization_Miss;
+  Runtime::FunctionId id = GetICState() == DEFAULT
+                               ? Runtime::kCallIC_Miss
+                               : Runtime::kCallIC_Customization_Miss;
 
-  ExternalReference miss = ExternalReference(IC_Utility(id), masm->isolate());
+  ExternalReference miss =
+      ExternalReference(Runtime::FunctionForId(id), masm->isolate());
   __ CallExternalReference(miss, 3);
 
   // Move result to edi and exit the internal frame.
@@ -3860,8 +3863,8 @@ void CompareICStub::GenerateKnownObjects(MacroAssembler* masm) {
 void CompareICStub::GenerateMiss(MacroAssembler* masm) {
   {
     // Call the runtime system in a fresh internal frame.
-    ExternalReference miss =
-        ExternalReference(IC_Utility(IC::kCompareIC_Miss), isolate());
+    ExternalReference miss = ExternalReference(
+        Runtime::FunctionForId(Runtime::kCompareIC_Miss), isolate());
 
     FrameScope scope(masm, StackFrame::INTERNAL);
     __ Push(rdx);