Handle-like interface for HashTable.

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 199 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(Array::Handle(isolate->object_store()->symbol_table()));
+  SymbolTable table(isolate, isolate->object_store()->symbol_table());
   *size = table.NumOccupied();
   *capacity = table.NumEntries();
   table.Release();
 }
 
 
 void Symbols::AddToVMIsolate(const String& str) {
   // Should only be run by the vm isolate.
   ASSERT(Isolate::Current() == Dart::vm_isolate());
   Isolate* isolate = Dart::vm_isolate();
-  Array& array = Array::Handle(isolate->object_store()->symbol_table());
-  SymbolTable table(array);
+  SymbolTable table(isolate, isolate->object_store()->symbol_table());
   bool present = table.Insert(str);
   str.SetCanonical();
   ASSERT(!present);
-  isolate->object_store()->set_symbol_table(array);
-  table.Release();
+  isolate->object_store()->set_symbol_table(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 28 matching lines @@
 
 
 RawString* Symbols::FromUTF32(const int32_t* utf32_array, intptr_t len) {
   return NewSymbol(UTF32Array(utf32_array, len));
 }
 
 
 // StringType can be StringSlice, Latin1Array, UTF16Array or UTF32Array.
 template<typename StringType>
 RawString* Symbols::NewSymbol(const StringType& str) {
-  String& symbol = String::Handle();
+  Isolate* isolate = Isolate::Current();
+  String& symbol = String::Handle(isolate);
   {
-    Isolate* isolate = Dart::vm_isolate();
-    Array& array = Array::Handle(isolate->object_store()->symbol_table());
-    SymbolTable table(array);
+    Isolate* vm_isolate = Dart::vm_isolate();
+    SymbolTable table(isolate, vm_isolate->object_store()->symbol_table());
     symbol ^= table.GetOrNull(str);
     table.Release();
   }
   if (symbol.IsNull()) {
-    Isolate* isolate = Isolate::Current();
-    Array& array = Array::Handle(isolate->object_store()->symbol_table());
-    SymbolTable table(array);
+    SymbolTable table(isolate, isolate->object_store()->symbol_table());
     symbol ^= table.InsertNewOrGet(str);
-    isolate->object_store()->set_symbol_table(array);
-    table.Release();
+    isolate->object_store()->set_symbol_table(table.Release());
   }
   ASSERT(symbol.IsSymbol());
   return symbol.raw();
 }
 
 
 RawString* Symbols::New(const String& str) {
   if (str.IsSymbol()) {
     return str.raw();
   }
@@ skipping 45 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