Don't use AstValueFactory in scope analysis.

src/ast/scopes.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/ast/scopes.h"
 
 #include <set>
 
 #include "src/accessors.h"
 #include "src/bootstrapper.h"
@@ skipping 831 matching lines @@
     outer_scope_calls_sloppy_eval =
         outer_scope_->outer_scope_calls_sloppy_eval() |
         outer_scope_->calls_sloppy_eval();
   }
   PropagateScopeInfo(outer_scope_calls_sloppy_eval);
 
   // 2) Resolve variables.
   ResolveVariablesRecursively(info, factory);
 
   // 3) Allocate variables.
-  AllocateVariablesRecursively(info->ast_value_factory());
+  AllocateVariablesRecursively();
 }
 
 
 bool Scope::HasTrivialContext() const {
   // A function scope has a trivial context if it always is the global
   // context. We iteratively scan out the context chain to see if
   // there is anything that makes this scope non-trivial; otherwise we
   // return true.
   for (const Scope* scope = this; scope != NULL; scope = scope->outer_scope_) {
     if (scope->is_eval_scope()) return false;
@@ skipping 736 matching lines @@
   }
 }
 
 void DeclarationScope::AllocateReceiver() {
   if (!has_this_declaration()) return;
   DCHECK_NOT_NULL(receiver());
   DCHECK_EQ(receiver()->scope(), this);
   AllocateParameter(receiver(), -1);
 }
 
-void Scope::AllocateNonParameterLocal(Variable* var,
-                                      AstValueFactory* ast_value_factory) {
+void Scope::AllocateNonParameterLocal(Variable* var) {
   DCHECK(var->scope() == this);
-  DCHECK(var->raw_name() != ast_value_factory->dot_result_string() ||
-         !var->IsStackLocal());
   if (var->IsUnallocated() && MustAllocate(var)) {
     if (MustAllocateInContext(var)) {
       AllocateHeapSlot(var);
     } else {
       AllocateStackSlot(var);
     }
   }
 }
 
-void Scope::AllocateDeclaredGlobal(Variable* var,
-                                   AstValueFactory* ast_value_factory) {
+void Scope::AllocateDeclaredGlobal(Variable* var) {
   DCHECK(var->scope() == this);
-  DCHECK(var->raw_name() != ast_value_factory->dot_result_string() ||
-         !var->IsStackLocal());
   if (var->IsUnallocated()) {
     if (var->IsStaticGlobalObjectProperty()) {
       DCHECK_EQ(-1, var->index());
       DCHECK(var->name()->IsString());
       var->AllocateTo(VariableLocation::GLOBAL, num_heap_slots_++);
       num_global_slots_++;
     } else {
       // There must be only DYNAMIC_GLOBAL in the script scope.
       DCHECK(!is_script_scope() || DYNAMIC_GLOBAL == var->mode());
     }
   }
 }
 
-void Scope::AllocateNonParameterLocalsAndDeclaredGlobals(
-    AstValueFactory* ast_value_factory) {
+void Scope::AllocateNonParameterLocalsAndDeclaredGlobals() {
   // All variables that have no rewrite yet are non-parameter locals.
   if (is_declaration_scope()) {
     ZoneList<Variable*>* temps = AsDeclarationScope()->temps();
     for (int i = 0; i < temps->length(); i++) {
-      AllocateNonParameterLocal((*temps)[i], ast_value_factory);
+      AllocateNonParameterLocal((*temps)[i]);
     }
   }
 
   ZoneList<VarAndOrder> vars(variables_.occupancy(), zone());
   for (VariableMap::Entry* p = variables_.Start();
        p != NULL;
        p = variables_.Next(p)) {
     Variable* var = reinterpret_cast<Variable*>(p->value);
     vars.Add(VarAndOrder(var, p->order), zone());
   }
   vars.Sort(VarAndOrder::Compare);
   int var_count = vars.length();
   for (int i = 0; i < var_count; i++) {
-    AllocateNonParameterLocal(vars[i].var(), ast_value_factory);
+    AllocateNonParameterLocal(vars[i].var());
   }
 
   if (FLAG_global_var_shortcuts) {
     for (int i = 0; i < var_count; i++) {
-      AllocateDeclaredGlobal(vars[i].var(), ast_value_factory);
+      AllocateDeclaredGlobal(vars[i].var());
     }
   }
 
   if (is_declaration_scope()) {
-    AsDeclarationScope()->AllocateLocals(ast_value_factory);
+    AsDeclarationScope()->AllocateLocals();
   }
 }
 
-void DeclarationScope::AllocateLocals(AstValueFactory* ast_value_factory) {
+void DeclarationScope::AllocateLocals() {
   // For now, function_ must be allocated at the very end.  If it gets
   // allocated in the context, it must be the last slot in the context,
   // because of the current ScopeInfo implementation (see
   // ScopeInfo::ScopeInfo(FunctionScope* scope) constructor).
   if (function_ != nullptr) {
-    AllocateNonParameterLocal(function_, ast_value_factory);
+    AllocateNonParameterLocal(function_);
   }
 
   if (rest_parameter_ != nullptr) {
-    AllocateNonParameterLocal(rest_parameter_, ast_value_factory);
+    AllocateNonParameterLocal(rest_parameter_);
   }
 
   if (new_target_ != nullptr && !MustAllocate(new_target_)) {
     new_target_ = nullptr;
   }
 
   if (this_function_ != nullptr && !MustAllocate(this_function_)) {
     this_function_ = nullptr;
   }
 }
 
 void DeclarationScope::AllocateModuleVariables() {
   for (auto it = module()->regular_imports().begin();
        it != module()->regular_imports().end(); ++it) {
     Variable* var = LookupLocal(it->second->local_name);
     // TODO(neis): Use a meaningful index.
     var->AllocateTo(VariableLocation::MODULE, 42);
   }
 
   for (auto entry : module()->exports()) {
     if (entry->local_name == nullptr) continue;
     Variable* var = LookupLocal(entry->local_name);
     var->AllocateTo(VariableLocation::MODULE, 42);
   }
 }
 
-void Scope::AllocateVariablesRecursively(AstValueFactory* ast_value_factory) {
+void Scope::AllocateVariablesRecursively() {
   if (!already_resolved()) {
     num_stack_slots_ = 0;
   }
   // Allocate variables for inner scopes.
   for (Scope* scope = inner_scope_; scope != nullptr; scope = scope->sibling_) {
-    scope->AllocateVariablesRecursively(ast_value_factory);
+    scope->AllocateVariablesRecursively();
   }
 
   // If scope is already resolved, we still need to allocate
   // variables in inner scopes which might not have been resolved yet.
   if (already_resolved()) return;
   // The number of slots required for variables.
   num_heap_slots_ = Context::MIN_CONTEXT_SLOTS;
 
   // Allocate variables for this scope.
   // Parameters must be allocated first, if any.
   if (is_declaration_scope()) {
     if (is_module_scope()) {
       AsDeclarationScope()->AllocateModuleVariables();
     } else if (is_function_scope()) {
       AsDeclarationScope()->AllocateParameterLocals();
     }
     AsDeclarationScope()->AllocateReceiver();
   }
-  AllocateNonParameterLocalsAndDeclaredGlobals(ast_value_factory);
+  AllocateNonParameterLocalsAndDeclaredGlobals();
 
   // Force allocation of a context for this scope if necessary. For a 'with'
   // scope and for a function scope that makes an 'eval' call we need a context,
   // even if no local variables were statically allocated in the scope.
   // Likewise for modules.
   bool must_have_context =
       is_with_scope() || is_module_scope() ||
       (is_function_scope() && calls_sloppy_eval()) ||
       (is_block_scope() && is_declaration_scope() && calls_sloppy_eval());
 
@@ skipping 24 matching lines @@
       function != nullptr && function->IsContextSlot();
   return num_heap_slots() - Context::MIN_CONTEXT_SLOTS - num_global_slots() -
          (is_function_var_in_context ? 1 : 0);
 }
 
 
 int Scope::ContextGlobalCount() const { return num_global_slots(); }
 
 }  // namespace internal
 }  // namespace v8