Migrate to Zone-based handle allocation in hash table and symbol table.

runtime/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/handles.h"
 #include "vm/handles_impl.h"
 #include "vm/hash_table.h"
 #include "vm/isolate.h"
@@ skipping 179 matching lines @@
   const intptr_t keyword_id = Symbols::kKwTableStart + 1 + kw_index;
   ASSERT(symbol_handles_[keyword_id] != NULL);
   return *symbol_handles_[keyword_id];
 }
 
 
 void Symbols::InitOnce(Isolate* vm_isolate) {
   // Should only be run by the vm isolate.
   ASSERT(Isolate::Current() == Dart::vm_isolate());
   ASSERT(vm_isolate == Dart::vm_isolate());
+  Zone* zone = Thread::Current()->zone();
 
   // Create and setup a symbol table in the vm isolate.
   SetupSymbolTable(vm_isolate);
 
   // Create all predefined symbols.
   ASSERT((sizeof(names) / sizeof(const char*)) == Symbols::kNullCharId);
 
-  SymbolTable table(vm_isolate, vm_isolate->object_store()->symbol_table());
+  SymbolTable table(zone, vm_isolate->object_store()->symbol_table());
 
   // First set up all the predefined string symbols.
   // Create symbols for language keywords. Some keywords are equal to
   // symbols we already created, so use New() instead of Add() to ensure
   // that the symbols are canonicalized.
   for (intptr_t i = 1; i < Symbols::kNullCharId; i++) {
     String* str = String::ReadOnlyHandle();
     *str = OneByteString::New(names[i], Heap::kOld);
     str->Hash();
     str->SetCanonical();
@@ skipping 19 matching lines @@
   }
 
   vm_isolate->object_store()->set_symbol_table(table.Release());
 }
 
 
 void Symbols::InitOnceFromSnapshot(Isolate* vm_isolate) {
   // Should only be run by the vm isolate.
   ASSERT(Isolate::Current() == Dart::vm_isolate());
   ASSERT(vm_isolate == Dart::vm_isolate());
+  Zone* zone = Thread::Current()->zone();
 
-  SymbolTable table(vm_isolate, vm_isolate->object_store()->symbol_table());
+  SymbolTable table(zone, vm_isolate->object_store()->symbol_table());
 
   // Lookup all the predefined string symbols and language keyword symbols
   // and cache them in the read only handles for fast access.
   for (intptr_t i = 1; i < Symbols::kNullCharId; i++) {
     String* str = String::ReadOnlyHandle();
     const unsigned char* name =
         reinterpret_cast<const unsigned char*>(names[i]);
     *str ^= table.GetOrNull(Latin1Array(name, strlen(names[i])));
     ASSERT(!str->IsNull());
     ASSERT(str->HasHash());
@@ skipping 16 matching lines @@
     predefined_[c] = str->raw();
     symbol_handles_[idx] = str;
   }
 
   vm_isolate->object_store()->set_symbol_table(table.Release());
 }
 
 
 void Symbols::AddPredefinedSymbolsToIsolate() {
   // Should only be run by regular Dart isolates.
-  Isolate* isolate = Isolate::Current();
+  Thread* thread = Thread::Current();
+  Isolate* isolate = thread->isolate();
+  Zone* zone = thread->zone();
   ASSERT(isolate != Dart::vm_isolate());
   String& str = String::Handle(isolate);
 
-  SymbolTable table(isolate, isolate->object_store()->symbol_table());
+  SymbolTable table(zone, isolate->object_store()->symbol_table());
 
   // Set up all the predefined string symbols and create symbols for
   // language keywords.
   for (intptr_t i = 1; i < Symbols::kNullCharId; i++) {
     str = OneByteString::New(names[i], Heap::kOld);
     str.Hash();
     str.SetCanonical();
     bool present = table.Insert(str);
     ASSERT(!present);
   }
@@ skipping 22 matching lines @@
   const intptr_t initial_size = (isolate == Dart::vm_isolate()) ?
       kInitialVMIsolateSymtabSize : kInitialSymtabSize;
   Array& array =
       Array::Handle(HashTables::New<SymbolTable>(initial_size, Heap::kOld));
   isolate->object_store()->set_symbol_table(array);
 }
 
 
 void Symbols::GetStats(Isolate* isolate, intptr_t* size, intptr_t* capacity) {
   ASSERT(isolate != NULL);
-  SymbolTable table(isolate, isolate->object_store()->symbol_table());
+  SymbolTable table(isolate->object_store()->symbol_table());
   *size = table.NumOccupied();
   *capacity = table.NumEntries();
   table.Release();
 }
 
 
 RawString* Symbols::New(const char* cstr, intptr_t len) {
   ASSERT((cstr != NULL) && (len >= 0));
   const uint8_t* utf8_array = reinterpret_cast<const uint8_t*>(cstr);
   return Symbols::FromUTF8(utf8_array, len);
@@ skipping 36 matching lines @@
 
 
 RawString* Symbols::FromConcat(const String& str1, const String& str2) {
   return NewSymbol(ConcatString(str1, str2));
 }
 
 
 // StringType can be StringSlice, ConcatString, or {Latin1,UTF16,UTF32}Array.
 template<typename StringType>
 RawString* Symbols::NewSymbol(const StringType& str) {
-  Isolate* isolate = Isolate::Current();
+  Thread* thread = Thread::Current();
+  Isolate* isolate = thread->isolate();
+  Zone* zone = thread->zone();
   String& symbol = String::Handle(isolate);
   {
     Isolate* vm_isolate = Dart::vm_isolate();
-    SymbolTable table(isolate, vm_isolate->object_store()->symbol_table());
+    SymbolTable table(zone, vm_isolate->object_store()->symbol_table());
     symbol ^= table.GetOrNull(str);
     table.Release();
   }
   if (symbol.IsNull()) {
-    SymbolTable table(isolate, isolate->object_store()->symbol_table());
+    SymbolTable table(zone, isolate->object_store()->symbol_table());
     symbol ^= table.InsertNewOrGet(str);
     isolate->object_store()->set_symbol_table(table.Release());
   }
   ASSERT(symbol.IsSymbol());
   ASSERT(symbol.HasHash());
   return symbol.raw();
 }
 
 
 RawString* Symbols::New(const String& str) {
@@ skipping 48 matching lines @@
 RawObject* Symbols::GetVMSymbol(intptr_t object_id) {
   ASSERT(IsVMSymbolId(object_id));
   intptr_t i = (object_id - kMaxPredefinedObjectIds);
   if ((i > kIllegal) && (i < Symbols::kMaxPredefinedId)) {
     return symbol_handles_[i]->raw();
   }
   return Object::null();
 }
 
 }  // namespace dart