Unify class ids and snapshot object ids list so that we don't have disparate and sometimes confusin…

vm/object_store.h

 // Copyright (c) 2011, 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.
 
 #ifndef VM_OBJECT_STORE_H_
 #define VM_OBJECT_STORE_H_
 
 #include "vm/object.h"
 
 namespace dart {
 
 // Forward declarations.
 class Isolate;
 class ObjectPointerVisitor;
 
 // The object store is a per isolate instance which stores references to
 // objects used by the VM.
 // TODO(iposva): Move the actual store into the object heap for quick handling
 // by snapshots eventually.
 class ObjectStore {
  public:
-  // Index for objects/types/classes stored in the object store,
-  // this index is used in snapshots to refer to classes or objects directly.
-  enum {
-    kTrueValue = Object::kMaxId,
-    kFalseValue,
-    kObjectType,
-    kNullType,
-    kDynamicType,
-    kVoidType,
-    kFunctionInterface,
-    kNumberInterface,
-    kDoubleInterface,
-    kIntInterface,
-    kBoolInterface,
-    kStringInterface,
-    kListInterface,
-    kByteArrayInterface,
-    kObjectClass,
-    kIntegerImplementationClass,
-    kSmiClass,
-    kMintClass,
-    kBigintClass,
-    kDoubleClass,
-    kOneByteStringClass,
-    kTwoByteStringClass,
-    kFourByteStringClass,
-    kExternalOneByteStringClass,
-    kExternalTwoByteStringClass,
-    kExternalFourByteStringClass,
-    kBoolClass,
-    kArrayClass,
-    kImmutableArrayClass,
-    kGrowableObjectArrayClass,
-    kInt8ArrayClass,
-    kUint8ArrayClass,
-    kInt16ArrayClass,
-    kUint16ArrayClass,
-    kInt32ArrayClass,
-    kUint32ArrayClass,
-    kInt64ArrayClass,
-    kUint64ArrayClass,
-    kFloat32ArrayClass,
-    kFloat64ArrayClass,
-    kExternalInt8ArrayClass,
-    kExternalUint8ArrayClass,
-    kExternalInt16ArrayClass,
-    kExternalUint16ArrayClass,
-    kExternalInt32ArrayClass,
-    kExternalUint32ArrayClass,
-    kExternalInt64ArrayClass,
-    kExternalUint64ArrayClass,
-    kExternalFloat32ArrayClass,
-    kExternalFloat64ArrayClass,
-    kStacktraceClass,
-    kJSRegExpClass,
-    kMaxId,
-    kInvalidIndex = -1,
-  };
-
   ~ObjectStore();
 
   RawClass* object_class() const {
     ASSERT(object_class_ != Object::null());
     return object_class_;
   }
   void set_object_class(const Class& value) { object_class_ = value.raw(); }
   static intptr_t object_class_offset() {
     return OFFSET_OF(ObjectStore, object_class_);
   }
@@ skipping 409 matching lines @@
 
   RawArray* keyword_symbols() const { return keyword_symbols_; }
   void set_keyword_symbols(const Array& value) {
     keyword_symbols_ = value.raw();
   }
   void InitKeywordTable();
 
   // Visit all object pointers.
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
 
-  RawClass* GetClass(int index);
-  int GetClassIndex(const RawClass* raw_class);
   RawType* GetType(int index);
   int GetTypeIndex(const RawType* raw_type);
 
   // Called to initialize objects required by the vm but which invoke
   // dart code.  If an error occurs then false is returned and error
   // information is stored in sticky_error().
   bool PreallocateObjects();
 
   static void Init(Isolate* isolate);
 
@@ skipping 75 matching lines @@
   RawObject** to() { return reinterpret_cast<RawObject**>(&keyword_symbols_); }
 
   friend class SnapshotReader;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectStore);
 };
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_STORE_H_