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

vm/symbols.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/symbols.h"
 
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/raw_object.h"
+#include "vm/snapshot_ids.h"
 #include "vm/unicode.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
-RawString* Symbols::predefined_[Symbols::kMaxPredefined];
+RawString* Symbols::predefined_[Symbols::kMaxId];
 
 // Turn off population of symbols in the VM symbol table, so that we
 // don't find these symbols while doing a Symbols::New(...).
 static const char* names[] = {
   NULL,
 
 #define DEFINE_SYMBOL_LITERAL(symbol, literal)                                 \
   literal,
 PREDEFINED_SYMBOLS_LIST(DEFINE_SYMBOL_LITERAL)
 #undef DEFINE_SYMBOL_LITERAL
 };
 
 
 void Symbols::InitOnce(Isolate* isolate) {
   // Should only be run by the vm isolate.
   ASSERT(isolate == Dart::vm_isolate());
 
   // Create and setup a symbol table in the vm isolate.
   SetupSymbolTable(isolate);
 
   // Turn off population of symbols in the VM symbol table, so that we
   // don't find these symbols while doing a Symbols::New(...).
   // Create all predefined symbols.
-  ASSERT((sizeof(names) / sizeof(const char*)) == kMaxPredefined);
+  ASSERT((sizeof(names) / sizeof(const char*)) == Symbols::kMaxId);
   const Array& symbol_table =
       Array::Handle(isolate->object_store()->symbol_table());
   OneByteString& str = OneByteString::Handle();
 
-  for (intptr_t i = 1; i < kMaxPredefined; i++) {
+  for (intptr_t i = 1; i < Symbols::kMaxId; i++) {
     str = OneByteString::New(names[i], Heap::kOld);
     Add(symbol_table, str);
     predefined_[i] = str.raw();
   }
 }
 
 
 void Symbols::SetupSymbolTable(Isolate* isolate) {
   ASSERT(isolate != NULL);
 
@@ skipping 232 matching lines @@
   symbol ^= symbol_table.At(index);
   while (!symbol.IsNull() && !symbol.Equals(str, begin_index, len)) {
     index = (index + 1) % table_size;  // Move to next element.
     symbol ^= symbol_table.At(index);
   }
   return index;  // Index of symbol if found or slot into which to add symbol.
 }
 
 
 intptr_t Symbols::LookupVMSymbol(RawObject* obj) {
-  for (intptr_t i = 1;  i < kMaxPredefined; i++) {
+  for (intptr_t i = 1;  i < Symbols::kMaxId; i++) {
     if (predefined_[i] == obj) {
-      return (i + Object::kMaxId);
+      return (i + kMaxPredefinedObjectIds);
     }
   }
-  return Object::kInvalidIndex;
+  return kInvalidIndex;
 }
 
 
 RawObject* Symbols::GetVMSymbol(intptr_t object_id) {
   ASSERT(IsVMSymbolId(object_id));
-  intptr_t i = (object_id - Object::kMaxId);
-  return (i > 0 && i < kMaxPredefined) ? predefined_[i] : Object::null();
+  intptr_t i = (object_id - kMaxPredefinedObjectIds);
+  return (i > 0 && i < Symbols::kMaxId) ? predefined_[i] : Object::null();
 }
 
 }  // namespace dart