1. Fix an issue with VM class names being null (this is exposed when doing a heap profile)

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"
@@ skipping 23 matching lines @@
 
   // 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*)) == Symbols::kMaxId);
   const Array& symbol_table =
       Array::Handle(isolate->object_store()->symbol_table());
-  OneByteString& str = OneByteString::Handle();
+  dart::OneByteString& str = OneByteString::Handle();
 
   for (intptr_t i = 1; i < Symbols::kMaxId; i++) {
     str = OneByteString::New(names[i], Heap::kOld);
     Add(symbol_table, str);
     predefined_[i] = str.raw();
   }
   Object::RegisterSingletonClassNames();
 }
 
 
 void Symbols::SetupSymbolTable(Isolate* isolate) {
   ASSERT(isolate != NULL);
 
   // Setup the symbol table used within the String class.
   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(initial_size, Smi::Handle(Smi::New(0)));
   isolate->object_store()->set_symbol_table(array);
 }
 
 
 intptr_t Symbols::Size(Isolate* isolate) {
   ASSERT(isolate != NULL);
   Array& symbol_table = Array::Handle(isolate,
                                       isolate->object_store()->symbol_table());
   intptr_t table_size_index = symbol_table.Length() - 1;
-  Smi& used = Smi::Handle();
+  dart::Smi& used = Smi::Handle();
   used ^= symbol_table.At(table_size_index);
   return used.Value();
 }
 
 
 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);
@@ skipping 111 matching lines @@
 
 
 void Symbols::GrowSymbolTable(const Array& symbol_table) {
   // TODO(iposva): Avoid exponential growth.
   intptr_t table_size = symbol_table.Length() - 1;
   intptr_t new_table_size = table_size * 2;
   Array& new_symbol_table = Array::Handle(Array::New(new_table_size + 1));
   // Copy all elements from the original symbol table to the newly allocated
   // array.
   String& element = String::Handle();
-  Object& new_element = Object::Handle();
+  dart::Object& new_element = Object::Handle();
   for (intptr_t i = 0; i < table_size; i++) {
     element ^= symbol_table.At(i);
     if (!element.IsNull()) {
       intptr_t hash = element.Hash();
       intptr_t index = hash % new_table_size;
       new_element = new_symbol_table.At(index);
       while (!new_element.IsNull()) {
         index = (index + 1) % new_table_size;  // Move to next element.
         new_element = new_symbol_table.At(index);
       }
       new_symbol_table.SetAt(index, element);
     }
   }
   // Copy used count.
   new_element = symbol_table.At(table_size);
   new_symbol_table.SetAt(new_table_size, new_element);
   // Remember the new symbol table now.
   Isolate::Current()->object_store()->set_symbol_table(new_symbol_table);
 }
 
 
 void Symbols::InsertIntoSymbolTable(const Array& symbol_table,
                                     const String& symbol,
                                     intptr_t index) {
   intptr_t table_size = symbol_table.Length() - 1;
   symbol.SetCanonical();  // Mark object as being canonical.
   symbol_table.SetAt(index, symbol);  // Remember the new symbol.
-  Smi& used = Smi::Handle();
+  dart::Smi& used = Smi::Handle();
   used ^= symbol_table.At(table_size);
   intptr_t used_elements = used.Value() + 1;  // One more element added.
   used = Smi::New(used_elements);
   symbol_table.SetAt(table_size, used);  // Update used count.
 
   // Rehash if symbol_table is 75% full.
   if (used_elements > ((table_size / 4) * 3)) {
     GrowSymbolTable(symbol_table);
   }
 }
@@ skipping 61 matching lines @@
 }
 
 
 RawObject* Symbols::GetVMSymbol(intptr_t object_id) {
   ASSERT(IsVMSymbolId(object_id));
   intptr_t i = (object_id - kMaxPredefinedObjectIds);
   return (i > 0 && i < Symbols::kMaxId) ? predefined_[i] : Object::null();
 }
 
 }  // namespace dart