- Add a new constructor to the hash table classes that allow handles to be passed in instead of cre…

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"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/raw_object.h"
+#include "vm/reusable_handles.h"
 #include "vm/snapshot_ids.h"
 #include "vm/unicode.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 RawString* Symbols::predefined_[Symbols::kNumberOfOneCharCodeSymbols];
 String* Symbols::symbol_handles_[Symbols::kMaxPredefinedId];
 
 static const char* names[] = {
@@ skipping 571 matching lines @@
     }
     ASSERT(len_sum == buffer - orig_buffer);
     return Symbols::FromUTF16(thread, orig_buffer, len_sum);
   }
 }
 
 
 // StringType can be StringSlice, ConcatString, or {Latin1,UTF16,UTF32}Array.
 template<typename StringType>
 RawString* Symbols::NewSymbol(Thread* thread, const StringType& str) {
-  Zone* zone = thread->zone();
-  String& symbol = String::Handle(zone);
+  REUSABLE_OBJECT_HANDLESCOPE(thread);
+  REUSABLE_SMI_HANDLESCOPE(thread);
+  REUSABLE_ARRAY_HANDLESCOPE(thread);
+  String& symbol = String::Handle(thread->zone());
+  dart::Object& key = thread->ObjectHandle();
+  Smi& value = thread->SmiHandle();
+  Array& data = thread->ArrayHandle();
   {
     Isolate* vm_isolate = Dart::vm_isolate();
-    SymbolTable table(zone, vm_isolate->object_store()->symbol_table());
+    data ^= vm_isolate->object_store()->symbol_table();
+    SymbolTable table(&key, &value, &data);
     symbol ^= table.GetOrNull(str);
     table.Release();
   }
   if (symbol.IsNull()) {
     Isolate* isolate = thread->isolate();
     SafepointMutexLocker ml(isolate->symbols_mutex());
-    SymbolTable table(zone, isolate->object_store()->symbol_table());
+    data ^= isolate->object_store()->symbol_table();
+    SymbolTable table(&key, &value, &data);
     symbol ^= table.InsertNewOrGet(str);
     isolate->object_store()->set_symbol_table(table.Release());
   }
   ASSERT(symbol.IsSymbol());
   ASSERT(symbol.HasHash());
   return symbol.raw();
 }
 
 
 template<typename StringType>
 RawString* Symbols::Lookup(Thread* thread, const StringType& str) {
-  Isolate* isolate = thread->isolate();
-  Zone* zone = thread->zone();
-  String& symbol = String::Handle(zone);
+  REUSABLE_OBJECT_HANDLESCOPE(thread);
+  REUSABLE_SMI_HANDLESCOPE(thread);
+  REUSABLE_ARRAY_HANDLESCOPE(thread);
+  String& symbol = String::Handle(thread->zone());
+  dart::Object& key = thread->ObjectHandle();
+  Smi& value = thread->SmiHandle();
+  Array& data = thread->ArrayHandle();
   {
     Isolate* vm_isolate = Dart::vm_isolate();
-    SymbolTable table(zone, vm_isolate->object_store()->symbol_table());
+    data ^= vm_isolate->object_store()->symbol_table();
+    SymbolTable table(&key, &value, &data);
     symbol ^= table.GetOrNull(str);
     table.Release();
   }
   if (symbol.IsNull()) {
+    Isolate* isolate = thread->isolate();
     SafepointMutexLocker ml(isolate->symbols_mutex());
-    SymbolTable table(zone, isolate->object_store()->symbol_table());
+    data ^= isolate->object_store()->symbol_table();
+    SymbolTable table(&key, &value, &data);
     symbol ^= table.GetOrNull(str);
     table.Release();
   }
 
   ASSERT(symbol.IsNull() || symbol.IsSymbol());
   ASSERT(symbol.IsNull() || symbol.HasHash());
   return symbol.raw();
 }
 
 
@@ skipping 106 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