Revert "Parser: Delay internalizing strings and values." (r21841)

src/interface.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/interface.h"
 
 namespace v8 {
 namespace internal {
 
+static bool Match(void* key1, void* key2) {
+  String* name1 = *static_cast<String**>(key1);
+  String* name2 = *static_cast<String**>(key2);
+  ASSERT(name1->IsInternalizedString());
+  ASSERT(name2->IsInternalizedString());
+  return name1 == name2;
+}
+
+
 Interface* Interface::Lookup(Handle<String> name, Zone* zone) {
   ASSERT(IsModule());
   ZoneHashMap* map = Chase()->exports_;
   if (map == NULL) return NULL;
   ZoneAllocationPolicy allocator(zone);
   ZoneHashMap::Entry* p = map->Lookup(name.location(), name->Hash(), false,
                                       allocator);
   if (p == NULL) return NULL;
   ASSERT(*static_cast<String**>(p->key) == *name);
   ASSERT(p->value != NULL);
   return static_cast<Interface*>(p->value);
 }
 
 
 #ifdef DEBUG
 // Current nesting depth for debug output.
 class Nesting {
  public:
   Nesting()  { current_ += 2; }
   ~Nesting() { current_ -= 2; }
   static int current() { return current_; }
  private:
   static int current_;
 };
 
 int Nesting::current_ = 0;
 #endif
 
 
-void Interface::DoAdd(const void* name, uint32_t hash, Interface* interface,
-                      Zone* zone, bool* ok) {
+void Interface::DoAdd(
+    void* name, uint32_t hash, Interface* interface, Zone* zone, bool* ok) {
   MakeModule(ok);
   if (!*ok) return;
 
 #ifdef DEBUG
   if (FLAG_print_interface_details) {
     PrintF("%*s# Adding...\n", Nesting::current(), "");
     PrintF("%*sthis = ", Nesting::current(), "");
     this->Print(Nesting::current());
-    const AstString* symbol = static_cast<const AstString*>(name);
-    PrintF("%*s%.*s : ", Nesting::current(), "", symbol->length(),
-           symbol->raw_data());
+    PrintF("%*s%s : ", Nesting::current(), "",
+           (*static_cast<String**>(name))->ToAsciiArray());
     interface->Print(Nesting::current());
   }
 #endif
 
   ZoneHashMap** map = &Chase()->exports_;
   ZoneAllocationPolicy allocator(zone);
 
   if (*map == NULL) {
     *map = new(zone->New(sizeof(ZoneHashMap)))
-        ZoneHashMap(ZoneHashMap::PointersMatch,
-                    ZoneHashMap::kDefaultHashMapCapacity, allocator);
+        ZoneHashMap(Match, ZoneHashMap::kDefaultHashMapCapacity, allocator);
   }
 
-  ZoneHashMap::Entry* p =
-      (*map)->Lookup(const_cast<void*>(name), hash, !IsFrozen(), allocator);
+  ZoneHashMap::Entry* p = (*map)->Lookup(name, hash, !IsFrozen(), allocator);
   if (p == NULL) {
     // This didn't have name but was frozen already, that's an error.
     *ok = false;
   } else if (p->value == NULL) {
     p->value = interface;
   } else {
 #ifdef DEBUG
     Nesting nested;
 #endif
     static_cast<Interface*>(p->value)->Unify(interface, zone, ok);
@@ skipping 128 matching lines @@
         PrintF("%*s%s : ", n0 + 2, "", name->ToAsciiArray());
         interface->Print(n0 + 2);
       }
       PrintF("%*s}\n", n0, "");
     }
   }
 }
 #endif
 
 } }  // namespace v8::internal