| Index: vm/symbols.cc
|
| ===================================================================
|
| --- vm/symbols.cc (revision 16012)
|
| +++ vm/symbols.cc (working copy)
|
| @@ -17,8 +17,9 @@
|
| 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)
|
| @@ -80,9 +81,10 @@
|
| 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
|
| @@ -276,7 +278,7 @@
|
|
|
|
|
| bool Symbols::IsPredefinedHandle(uword address) {
|
| - return predefined_handles_.IsValidScopedHandle(address);
|
| + return predefined_handles_->IsValidHandle(address);
|
| }
|
|
|
|
|
|
|