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

src/interface.h

 // 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.
 
 #ifndef V8_INTERFACE_H_
 #define V8_INTERFACE_H_
 
-#include "src/ast-value-factory.h"
 #include "src/zone-inl.h"  // For operator new.
 
 namespace v8 {
 namespace internal {
 
 
 // This class implements the following abstract grammar of interfaces
 // (i.e. module types):
 //   interface ::= UNDETERMINED | VALUE | CONST | MODULE(exports)
 //   exports ::= {name : interface, ...}
@@ skipping 34 matching lines @@
 
   static Interface* NewModule(Zone* zone) {
     return new(zone) Interface(MODULE);
   }
 
   // ---------------------------------------------------------------------------
   // Mutators.
 
   // Add a name to the list of exports. If it already exists, unify with
   // interface, otherwise insert unless this is closed.
-  void Add(const AstString* name, Interface* interface, Zone* zone,
-           bool* ok) {
-    DoAdd(name, name->hash(), interface, zone, ok);
+  void Add(Handle<String> name, Interface* interface, Zone* zone, bool* ok) {
+    DoAdd(name.location(), name->Hash(), interface, zone, ok);
   }
 
   // Unify with another interface. If successful, both interface objects will
   // represent the same type, and changes to one are reflected in the other.
   void Unify(Interface* that, Zone* zone, bool* ok);
 
   // Determine this interface to be a value interface.
   void MakeValue(bool* ok) {
     *ok = !IsModule();
     if (*ok) Chase()->flags_ |= VALUE;
@@ skipping 65 matching lines @@
   // ---------------------------------------------------------------------------
   // Iterators.
 
   // Use like:
   //   for (auto it = interface->iterator(); !it.done(); it.Advance()) {
   //     ... it.name() ... it.interface() ...
   //   }
   class Iterator {
    public:
     bool done() const { return entry_ == NULL; }
-    const AstString* name() const {
+    Handle<String> name() const {
       ASSERT(!done());
-      return static_cast<const AstString*>(entry_->key);
+      return Handle<String>(*static_cast<String**>(entry_->key));
     }
     Interface* interface() const {
       ASSERT(!done());
       return static_cast<Interface*>(entry_->value);
     }
     void Advance() { entry_ = exports_->Next(entry_); }
 
    private:
     friend class Interface;
     explicit Iterator(const ZoneHashMap* exports)
@@ skipping 38 matching lines @@
 #endif
   }
 
   Interface* Chase() {
     Interface* result = this;
     while (result->forward_ != NULL) result = result->forward_;
     if (result != this) forward_ = result;  // On-the-fly path compression.
     return result;
   }
 
-  void DoAdd(const void* name, uint32_t hash, Interface* interface, Zone* zone,
+  void DoAdd(void* name, uint32_t hash, Interface* interface, Zone* zone,
              bool* ok);
   void DoUnify(Interface* that, bool* ok, Zone* zone);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_INTERFACE_H_