Dynamically Allocate the predefined handles structure in Symbols

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/isolate.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/raw_object.h"
 #include "vm/snapshot_ids.h"
 #include "vm/unicode.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 RawString* Symbols::predefined_[Symbols::kMaxId];
-VMHandles Symbols::predefined_handles_;
+
+Symbols::ReadOnlyHandles* Symbols::predefined_handles_ = NULL;
 
 #define DEFINE_SYMBOL_HANDLE(symbol)                                           \
   String* Symbols::symbol##_handle_ = NULL;
 PREDEFINED_SYMBOL_HANDLES_LIST(DEFINE_SYMBOL_HANDLE)
 #undef DEFINE_SYMBOL_HANDLE
 
 static const char* names[] = {
   NULL,
 
 #define DEFINE_SYMBOL_LITERAL(symbol, literal)                                 \
@@ skipping 42 matching lines @@
     Add(symbol_table, str);
     predefined_[i] = str.raw();
   }
   Object::RegisterSingletonClassNames();
 
   for (int32_t c = 0; c <= kMaxOneCharCodeSymbol; c++) {
     ASSERT(kMaxPredefinedId + c < kMaxId);
     predefined_[kMaxPredefinedId + c] = FromUTF32(&c, 1);
   }
 
+  predefined_handles_ = new ReadOnlyHandles();
 #define INITIALIZE_SYMBOL_HANDLE(symbol)                                       \
   symbol##_handle_ = reinterpret_cast<String*>(                                \
-      predefined_handles_.AllocateScopedHandle());                             \
+      predefined_handles_->AllocateHandle());                                  \
   *symbol##_handle_ = symbol();
 PREDEFINED_SYMBOL_HANDLES_LIST(INITIALIZE_SYMBOL_HANDLE)
 #undef INITIALIZE_SYMBOL_HANDLE
 }
 
 
 void Symbols::SetupSymbolTable(Isolate* isolate) {
   ASSERT(isolate != NULL);
 
   // Setup the symbol table used within the String class.
@@ skipping 173 matching lines @@
 
 RawString* Symbols::FromCharCode(int32_t char_code) {
   if (char_code > kMaxOneCharCodeSymbol) {
     return FromUTF32(&char_code, 1);
   }
   return predefined_[kNullCharId + char_code];
 }
 
 
 bool Symbols::IsPredefinedHandle(uword address) {
-  return predefined_handles_.IsValidScopedHandle(address);
+  return predefined_handles_->IsValidHandle(address);
 }
 
 
 void Symbols::DumpStats() {
   if (FLAG_dump_symbol_stats) {
     intptr_t table_size = 0;
     dart::Smi& used = Smi::Handle();
     Array& symbol_table = Array::Handle(Array::null());
 
     // First dump VM symbol table stats.
@@ skipping 158 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