Move more symbols to the vm isolate.

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/unicode.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
-const char* Symbols::kDot = ".";
-RawString* Symbols::dot_ = String::null();
+RawString* Symbols::predefined_[Symbols::kMaxPredefined];
+
+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);
 
   // Create all predefined symbols.
+  ASSERT((sizeof(names) / sizeof(const char*)) == kMaxPredefined);
   const Array& symbol_table =
       Array::Handle(isolate->object_store()->symbol_table());
   OneByteString& str = OneByteString::Handle();
 
-  str = OneByteString::New(kDot, Heap::kOld);
-  Add(symbol_table, str);  // "."
-  dot_ = str.raw();
+  for (intptr_t i = 1; i < kMaxPredefined; i++) {
+    str = OneByteString::New(names[i], Heap::kOld);
+    Add(symbol_table, str);
+    predefined_[i] = str.raw();
+  }
 }
 
 
 void Symbols::SetupSymbolTable(Isolate* isolate) {
   ASSERT(isolate != NULL);
 
   // Setup the symbol table used within the String class.
-  const Array& array = Array::Handle(Array::New(kInitialSymbolTableSize + 1));
+  const int initial_size = (isolate == Dart::vm_isolate()) ?
+      kInitialVMIsolateSymtabSize : kInitialSymtabSize;
+  const Array& array = Array::Handle(Array::New(initial_size + 1));
 
   // Last element contains the count of used slots.
-  array.SetAt(kInitialSymbolTableSize, Smi::Handle(Smi::New(0)));
+  array.SetAt(initial_size, Smi::Handle(Smi::New(0)));
   isolate->object_store()->set_symbol_table(array);
 }
 
 
 void Symbols::Add(const Array& symbol_table, const String& str) {
   // Should only be run by the vm isolate.
   ASSERT(Isolate::Current() == Dart::vm_isolate());
   intptr_t hash = str.Hash();
   intptr_t index = FindIndex(symbol_table, str, 0, str.Length(), hash);
   ASSERT(symbol_table.At(index) == String::null());
@@ skipping 204 matching lines @@
   String& symbol = String::Handle();
   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.
 }
 
 }  // namespace dart