Force ctxt allocation in eval scopes.

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/ast/ast.h"
@@ skipping 106 matching lines @@
 
 Scope::Scope(Zone* zone, Scope* outer_scope, ScopeType scope_type)
     : zone_(zone),
       outer_scope_(outer_scope),
       variables_(zone),
       scope_type_(scope_type) {
   DCHECK_NE(SCRIPT_SCOPE, scope_type);
   SetDefaults();
   set_language_mode(outer_scope->language_mode());
   force_context_allocation_ =
-      !is_function_scope() && outer_scope->has_forced_context_allocation();
+      (!is_function_scope() && outer_scope->has_forced_context_allocation()) ||
+      is_eval_scope();

[adamk, 2017/01/03 18:33:43]

I don't think you want to do this here; "forced context allocation" is really
specific to generators. I think the right place to put this is in
MustAllocateInContext, just like we do for script scoped lexical variables.

[marja, 2017/01/03 19:55:50]

Done.

   outer_scope_->AddInnerScope(this);
 }
 
 Scope::Snapshot::Snapshot(Scope* scope)
     : outer_scope_(scope),
       top_inner_scope_(scope->inner_scope_),
       top_unresolved_(scope->unresolved_),
       top_local_(scope->GetClosureScope()->locals_.end()),
       top_decl_(scope->GetClosureScope()->decls_.end()) {}
 
@@ skipping 1034 matching lines @@
 
 bool Scope::AllowsLazyParsingWithoutUnresolvedVariables(
     const Scope* outer) const {
   // If none of the outer scopes need to decide whether to context allocate
   // specific variables, we can preparse inner functions without unresolved
   // variables. Otherwise we need to find unresolved variables to force context
   // allocation of the matching declarations. We can stop at the outer scope for
   // the parse, since context allocation of those variables is already
   // guaranteed to be correct.
   for (const Scope* s = this; s != outer; s = s->outer_scope_) {
-    if (s->is_eval_scope()) return false;
     // Catch scopes force context allocation of all variables.
     if (s->is_catch_scope()) continue;
     // With scopes do not introduce variables that need allocation.
     if (s->is_with_scope()) continue;
     // If everything is guaranteed to be context allocated we can ignore the
     // scope.
     if (s->has_forced_context_allocation()) continue;
     // Only block scopes and function scopes should disallow preparsing.
     DCHECK(s->is_block_scope() || s->is_function_scope());
     return false;
@@ skipping 930 matching lines @@
   Variable* function =
       is_function_scope() ? AsDeclarationScope()->function_var() : nullptr;
   bool is_function_var_in_context =
       function != nullptr && function->IsContextSlot();
   return num_heap_slots() - Context::MIN_CONTEXT_SLOTS -
          (is_function_var_in_context ? 1 : 0);
 }
 
 }  // namespace internal
 }  // namespace v8