Refactoring InterfaceDescriptors away from code-stubs.h

src/isolate.cc

Index: src/isolate.cc
diff --git a/src/isolate.cc b/src/isolate.cc
index 13dea488b46a6801265206ee162cbabc64c78081..028da3d8fc86a62000087050955f817563a74372 100644
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -2030,6 +2030,8 @@ bool Isolate::Init(Deserializer* des) {
         kDeoptTableSerializeEntryCount - 1);
   }
 
+  CallDescriptors::InitializeForIsolate(this);
+
   if (!serializer_enabled()) {
     // Ensure that all stubs which need to be generated ahead of time, but
     // cannot be serialized into the snapshot have been generated.
@@ -2057,8 +2059,6 @@ bool Isolate::Init(Deserializer* des) {
     LoadFastElementStub::InstallDescriptors(this);
   }
 
-  CallDescriptors::InitializeForIsolate(this);
-
   initialized_from_snapshot_ = (des != NULL);
 
   return true;
@@ -2242,9 +2242,8 @@ CodeStubInterfaceDescriptor*
 }
 
 
-CallInterfaceDescriptor*
-    Isolate::call_descriptor(CallDescriptorKey index) {
-  DCHECK(0 <= index && index < NUMBER_OF_CALL_DESCRIPTORS);
+CallInterfaceDescriptor* Isolate::call_descriptor(int index) {
+  DCHECK(0 <= index && index < CallDescriptorKey::NUMBER_OF_CALL_DESCRIPTORS);
   return &call_descriptors_[index];
 }