Optimize the scope creation code by lazily allocating the hash maps

for dynamic variables (only do it for the scopes that need them).
Review URL: http://codereview.chromium.org/113393

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1942 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/hashmap.cc

@@ -31,13 +31,6 @@
 
 namespace v8 { namespace internal {
 
-
-static inline bool IsPowerOf2(uint32_t x) {
-  ASSERT(x != 0);
-  return (x & (x - 1)) == 0;
-}
-
-
 Allocator HashMap::DefaultAllocator;
 
 

src/objects.cc

@@ -3437,8 +3437,8 @@ const uc16* SeqTwoByteString::SeqTwoByteStringGetData(unsigned start) {
 
 
 void SeqTwoByteString::SeqTwoByteStringReadBlockIntoBuffer(ReadBlockBuffer* rbb,
-                                                     unsigned* offset_ptr,
-                                                     unsigned max_chars) {
+                                                           unsigned* offset_ptr,
+                                                           unsigned max_chars) {
   unsigned chars_read = 0;
   unsigned offset = *offset_ptr;
   while (chars_read < max_chars) {

src/scopes.cc

@@ -112,9 +112,7 @@ Scope::Scope()
     locals_(false),
     temps_(0),
     params_(0),
-    dynamics_(false),
-    dynamics_local_(false),
-    dynamics_global_(false),
+    dynamics_(NULL),
     unresolved_(0),
     decls_(0) {
 }
@@ -125,9 +123,9 @@ Scope::Scope(Scope* outer_scope, Type type)
     inner_scopes_(4),
     type_(type),
     scope_name_(Factory::empty_symbol()),
-    locals_(),
     temps_(4),
     params_(4),
+    dynamics_(NULL),
     unresolved_(16),
     decls_(4),
     receiver_(NULL),
@@ -477,9 +475,11 @@ void Scope::Print(int n) {
   PrintMap(&printer, n1, &locals_);
 
   Indent(n1, "// dynamic vars\n");
-  PrintMap(&printer, n1, &dynamics_);
-  PrintMap(&printer, n1, &dynamics_local_);
-  PrintMap(&printer, n1, &dynamics_global_);
+  if (dynamics_ != NULL) {
+    PrintMap(&printer, n1, dynamics_->GetMap(Variable::DYNAMIC));
+    PrintMap(&printer, n1, dynamics_->GetMap(Variable::DYNAMIC_LOCAL));
+    PrintMap(&printer, n1, dynamics_->GetMap(Variable::DYNAMIC_GLOBAL));
+  }
 
   // Print inner scopes (disable by providing negative n).
   if (n >= 0) {
@@ -495,23 +495,8 @@ void Scope::Print(int n) {
 
 
 Variable* Scope::NonLocal(Handle<String> name, Variable::Mode mode) {
-  // Space optimization: reuse existing non-local with the same name
-  // and mode.
-  LocalsMap* map = NULL;
-  switch (mode) {
-    case Variable::DYNAMIC:
-      map = &dynamics_;
-      break;
-    case Variable::DYNAMIC_LOCAL:
-      map = &dynamics_local_;
-      break;
-    case Variable::DYNAMIC_GLOBAL:
-      map = &dynamics_global_;
-      break;
-    default:
-      UNREACHABLE();
-      break;
-  }
+  if (dynamics_ == NULL) dynamics_ = new DynamicScopePart();
+  LocalsMap* map = dynamics_->GetMap(mode);
   Variable* var = map->Lookup(name);
   if (var == NULL) {
     // Declare a new non-local.

src/scopes.h

@@ -35,7 +35,6 @@ namespace v8 { namespace internal {
 
 
 // A hash map to support fast local variable declaration and lookup.
-
 class LocalsMap: public HashMap {
  public:
   LocalsMap();
@@ -53,6 +52,23 @@ class LocalsMap: public HashMap {
 };
 
 
+// The dynamic scope part holds hash maps for the variables that will
+// be looked up dynamically from within eval and with scopes. The objects
+// are allocated on-demand from Scope::NonLocal to avoid wasting memory
+// and setup time for scopes that don't need them.
+class DynamicScopePart : public ZoneObject {
+ public:
+  LocalsMap* GetMap(Variable::Mode mode) {
+    int index = mode - Variable::DYNAMIC;
+    ASSERT(index >= 0 && index < 3);
+    return &maps_[index];
+  }
+
+ private:
+  LocalsMap maps_[3];
+};
+
+
 // Global invariants after AST construction: Each reference (i.e. identifier)
 // to a JavaScript variable (including global properties) is represented by a
 // VariableProxy node. Immediately after AST construction and before variable
@@ -278,9 +294,7 @@ class Scope: public ZoneObject {
   // parameter list in source order
   ZoneList<Variable*> params_;
   // variables that must be looked up dynamically
-  LocalsMap dynamics_;
-  LocalsMap dynamics_local_;
-  LocalsMap dynamics_global_;
+  DynamicScopePart* dynamics_;
   // unresolved variables referred to from this scope
   ZoneList<VariableProxy*> unresolved_;
   // declarations

src/utils.h

@@ -42,8 +42,6 @@ static inline bool IsPowerOf2(T x) {
 }
 
 
-
-
 // The C++ standard leaves the semantics of '>>' undefined for
 // negative signed operands. Most implementations do the right thing,
 // though.