Gentle start with removing explicit interfaces

runtime/vm/snapshot.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/exceptions.h"
@@ skipping 41 matching lines @@
   return (class_id + kClassIdsOffset);
 }
 
 
 static RawType* GetType(ObjectStore* object_store, int index) {
   switch (index) {
     case kObjectType: return object_store->object_type();
     case kNullType: return object_store->null_type();
     case kDynamicType: return object_store->dynamic_type();
     case kVoidType: return object_store->void_type();
-    case kFunctionInterface: return object_store->function_interface();
-    case kNumberInterface: return object_store->number_interface();
+    case kFunctionType: return object_store->function_type();
+    case kNumberType: return object_store->number_type();
     case kDoubleInterface: return object_store->double_interface();
     case kIntInterface: return object_store->int_interface();
     case kBoolInterface: return object_store->bool_interface();
     case kStringInterface: return object_store->string_interface();
     case kListInterface: return object_store->list_interface();
     case kByteArrayInterface: return object_store->byte_array_interface();
     default: break;
   }
   UNREACHABLE();
   return Type::null();
 }
 
 
 static int GetTypeIndex(ObjectStore* object_store, const RawType* raw_type) {
   ASSERT(raw_type->IsHeapObject());
   if (raw_type == object_store->object_type()) {
     return kObjectType;
   } else if (raw_type == object_store->null_type()) {
     return kNullType;
   } else if (raw_type == object_store->dynamic_type()) {
     return kDynamicType;
   } else if (raw_type == object_store->void_type()) {
     return kVoidType;
-  } else if (raw_type == object_store->function_interface()) {
-    return kFunctionInterface;
-  } else if (raw_type == object_store->number_interface()) {
-    return kNumberInterface;
+  } else if (raw_type == object_store->function_type()) {
+    return kFunctionType;
+  } else if (raw_type == object_store->number_type()) {
+    return kNumberType;
   } else if (raw_type == object_store->double_interface()) {
     return kDoubleInterface;
   } else if (raw_type == object_store->int_interface()) {
     return kIntInterface;
   } else if (raw_type == object_store->bool_interface()) {
     return kBoolInterface;
   } else if (raw_type == object_store->string_interface()) {
     return kStringInterface;
   } else if (raw_type == object_store->list_interface()) {
     return kListInterface;
@@ skipping 306 matching lines @@
       AllocateUninitialized(cls_, Context::InstanceSize(num_variables)));
   obj->ptr()->num_variables_ = num_variables;
   return obj;
 }
 
 
 RawClass* SnapshotReader::NewClass(intptr_t class_id, bool is_signature_class) {
   ASSERT(kind_ == Snapshot::kFull);
   ASSERT(isolate()->no_gc_scope_depth() != 0);
   if (class_id < kNumPredefinedCids) {
-    ASSERT((class_id >= kInstanceCid) && (class_id <= kWeakPropertyCid));
+    ASSERT((class_id >= kInstanceCid) && (class_id <= kDartFunctionCid));
     return isolate()->class_table()->At(class_id);
   }
   cls_ = Object::class_class();
   RawClass* obj = reinterpret_cast<RawClass*>(
       AllocateUninitialized(cls_, Class::InstanceSize()));
   if (is_signature_class) {
     Closure fake;
     obj->ptr()->handle_vtable_ = fake.vtable();
   } else {
     Instance fake;
@@ skipping 693 matching lines @@
     RawObject* raw_obj = *current;
     if (as_references_) {
       writer_->WriteObjectRef(raw_obj);
     } else {
       writer_->WriteObjectImpl(raw_obj);
     }
   }
 }
 
 }  // namespace dart