- Make use of the fact that idents and literals are symbols.

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 7393 matching lines @@
       token_obj_(Object::Handle()),
       literal_token_(LiteralToken::Handle()),
       literal_str_(String::Handle()) {
     token_objects_.Add(Object::null_string());
   }
   ~CompressedTokenStreamData() {
   }
 
   // Add an IDENT token into the stream and the token objects array.
   void AddIdentToken(const String* ident) {
-    ASSERT(ident != NULL);
-    ASSERT(ident->IsSymbol());
     // If the IDENT token is already in the tokens object array use the
     // same index instead of duplicating it.
     intptr_t index = FindIdentIndex(ident);
     if (index == -1) {
       WriteIndex(token_objects_.Length());
       ASSERT(ident != NULL);
       token_objects_.Add(*ident);
     } else {
       WriteIndex(index);
     }
   }
 
   // Add a LITERAL token into the stream and the token objects array.
   void AddLiteralToken(Token::Kind kind, const String* literal) {
-    if (literal != NULL) {
-      // If the literal token is already in the tokens object array use the
-      // same index instead of duplicating it.
-      intptr_t index = FindLiteralIndex(kind, literal);
-      if (index == -1) {
-        WriteIndex(token_objects_.Length());
-        ASSERT(literal != NULL);
-        literal_token_ = LiteralToken::New(kind, *literal);
-        token_objects_.Add(literal_token_);
-      } else {
-        WriteIndex(index);
-      }
+    // If the literal token is already in the tokens object array use the
+    // same index instead of duplicating it.
+    intptr_t index = FindLiteralIndex(kind, literal);
+    if (index == -1) {
+      WriteIndex(token_objects_.Length());
+      ASSERT(literal != NULL);
+      literal_token_ = LiteralToken::New(kind, *literal);
+      token_objects_.Add(literal_token_);
     } else {
-      WriteIndex(0);
+      WriteIndex(index);
     }
   }
 
   // Add a simple token into the stream.
   void AddSimpleToken(intptr_t kind) {
     stream_.WriteUnsigned(kind);
   }
 
   // Return the compressed token stream.
   uint8_t* GetStream() const { return buffer_; }
 
   // Return the compressed token stream length.
   intptr_t Length() const { return stream_.bytes_written(); }
 
   // Return the token objects array.
   const GrowableObjectArray& TokenObjects() const {
     return token_objects_;
   }
 
  private:
   intptr_t FindIdentIndex(const String* ident) {
     ASSERT(ident != NULL);
+    ASSERT(ident->IsSymbol());
     intptr_t hash_value = ident->Hash() % kTableSize;
     GrowableArray<intptr_t>& value = ident_table_[hash_value];
     for (intptr_t i = 0; i < value.length(); i++) {
       intptr_t index = value[i];
-      token_obj_ = token_objects_.At(index);
-      if (token_obj_.IsString()) {
-        const String& ident_str = String::Cast(token_obj_);
-        if (ident->Equals(ident_str)) {
-          return index;
-        }
+      if (token_objects_.At(index) == ident->raw()) {
+        return index;
       }
     }
     value.Add(token_objects_.Length());
     return -1;
   }
 
   intptr_t FindLiteralIndex(Token::Kind kind, const String* literal) {
     ASSERT(literal != NULL);
+    ASSERT(literal->IsSymbol());
     intptr_t hash_value = literal->Hash() % kTableSize;
     GrowableArray<intptr_t>& value = literal_table_[hash_value];
     for (intptr_t i = 0; i < value.length(); i++) {
       intptr_t index = value[i];
       token_obj_ = token_objects_.At(index);
-      if (token_obj_.IsLiteralToken()) {
-        const LiteralToken& token = LiteralToken::Cast(token_obj_);
-        literal_str_ = token.literal();
-        if (kind == token.kind() && literal->Equals(literal_str_)) {
-          return index;
-        }
+      const LiteralToken& token = LiteralToken::Cast(token_obj_);
+      if ((kind == token.kind()) && (token.literal() == literal->raw())) {
+        return index;
       }
     }
     value.Add(token_objects_.Length());
     return -1;
   }
 
   void WriteIndex(intptr_t value) {
     stream_.WriteUnsigned(value + Token::kNumTokens);
   }
 
@@ skipping 11351 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart