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

src/variables.h

 // Copyright 2011 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_VARIABLES_H_
 #define V8_VARIABLES_H_
 
-#include "src/ast-value-factory.h"
 #include "src/zone.h"
 #include "src/interface.h"
 
 namespace v8 {
 namespace internal {
 
 // The AST refers to variables via VariableProxies - placeholders for the actual
 // variables. Variables themselves are never directly referred to from the AST,
 // they are maintained by scopes, and referred to from VariableProxies and Slots
 // after binding and variable allocation.
@@ skipping 27 matching lines @@
     // corresponding scope.
     CONTEXT,
 
     // A named slot in a heap context.  name() is the variable name in the
     // context object on the heap, with lookup starting at the current
     // context.  index() is invalid.
     LOOKUP
   };
 
   Variable(Scope* scope,
-           const AstString* name,
+           Handle<String> name,
            VariableMode mode,
            bool is_valid_ref,
            Kind kind,
            InitializationFlag initialization_flag,
            Interface* interface = Interface::NewValue());
 
   // Printing support
   static const char* Mode2String(VariableMode mode);
 
   bool IsValidReference() { return is_valid_ref_; }
 
   // The source code for an eval() call may refer to a variable that is
   // in an outer scope about which we don't know anything (it may not
   // be the global scope). scope() is NULL in that case. Currently the
   // scope is only used to follow the context chain length.
   Scope* scope() const { return scope_; }
 
-  Handle<String> name() const { return name_->string(); }
-  const AstString* raw_name() const { return name_; }
+  Handle<String> name() const { return name_; }
   VariableMode mode() const { return mode_; }
   bool has_forced_context_allocation() const {
     return force_context_allocation_;
   }
   void ForceContextAllocation() {
     ASSERT(mode_ != TEMPORARY);
     force_context_allocation_ = true;
   }
   bool is_used() { return is_used_; }
   void set_is_used(bool flag) { is_used_ = flag; }
@@ skipping 45 matching lines @@
 
   void AllocateTo(Location location, int index) {
     location_ = location;
     index_ = index;
   }
 
   static int CompareIndex(Variable* const* v, Variable* const* w);
 
  private:
   Scope* scope_;
-  const AstString* name_;
+  Handle<String> name_;
   VariableMode mode_;
   Kind kind_;
   Location location_;
   int index_;
   int initializer_position_;
 
   // If this field is set, this variable references the stored locally bound
   // variable, but it might be shadowed by variable bindings introduced by
   // sloppy 'eval' calls between the reference scope (inclusive) and the
   // binding scope (exclusive).
   Variable* local_if_not_shadowed_;
 
   // Valid as a reference? (const and this are not valid, for example)
   bool is_valid_ref_;
 
   // Usage info.
   bool force_context_allocation_;  // set by variable resolver
   bool is_used_;
   InitializationFlag initialization_flag_;
 
   // Module type info.
   Interface* interface_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_VARIABLES_H_