- Prepopulate the keyword symbol table otherwise we can end up

runtime/vm/scanner.cc

Index: runtime/vm/scanner.cc
===================================================================
--- runtime/vm/scanner.cc	(revision 14446)
+++ runtime/vm/scanner.cc	(working copy)
@@ -24,6 +24,12 @@
     object_store->InitKeywordTable();

[hausner, 2012/11/02 16:35:18]

Looking at this code now I see that ObjectStore::InitKeywordTable basically just
allocates the array. I think we can simplify this. I'll put it on my todo list.

     keyword_symbol_table_ = object_store->keyword_symbols();
     ASSERT(!keyword_symbol_table_.IsNull());
+    String& symbol = String::Handle();
+    for (int i = 0; i < Token::numKeywords; i++) {
+      Token::Kind token = static_cast<Token::Kind>(Token::kFirstKeyword + i);
+      symbol = Symbols::New(Token::Str(token));
+      keyword_symbol_table_.SetAt(i, symbol);
+    }
   }
   for (int i = 0; i < Token::numKeywords; i++) {
     Token::Kind token = static_cast<Token::Kind>(Token::kFirstKeyword + i);
@@ -276,10 +282,7 @@
         if (keywords_[i].keyword_symbol == NULL) {
           String& symbol = String::ZoneHandle();
           symbol ^= keyword_symbol_table_.At(i);
-          if (symbol.IsNull()) {
-            symbol = Symbols::New(source_, ident_pos, ident_length);
-            keyword_symbol_table_.SetAt(i, symbol);
-          }
+          ASSERT(!symbol.IsNull());
           keywords_[i].keyword_symbol = &symbol;
         }
         current_token_.literal = keywords_[i].keyword_symbol;