Move Parser::Declare to Scope.

src/parsing/pattern-rewriter.cc

 // Copyright 2015 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/ast.h"
 #include "src/messages.h"
 #include "src/parsing/parameter-initializer-rewriter.h"
 #include "src/parsing/parser.h"
 
 namespace v8 {
@@ skipping 134 matching lines @@
   // surrounding 'with' statements).
   // For let/const declarations in harmony mode, we can also immediately
   // pre-resolve the proxy because it resides in the same scope as the
   // declaration.
   const AstRawString* name = pattern->raw_name();
   VariableProxy* proxy = descriptor_->scope->NewUnresolved(
       factory(), name, parser_->scanner()->location().beg_pos,
       parser_->scanner()->location().end_pos);
   Declaration* declaration = factory()->NewVariableDeclaration(
       proxy, descriptor_->scope, descriptor_->declaration_pos);
-  Variable* var = parser_->Declare(declaration, descriptor_->declaration_kind,
-                                   descriptor_->mode,
-                                   DefaultInitializationFlag(descriptor_->mode),
-                                   ok_, descriptor_->hoist_scope);
+  Scope* scope = descriptor_->hoist_scope;
+  if (scope == nullptr) {
+    scope = parser_->scope();
+  }
+  Variable* var = scope->DeclareVariableOrParameter(
+      declaration, descriptor_->declaration_kind, descriptor_->mode,
+      DefaultInitializationFlag(descriptor_->mode),
+      parser_->allow_harmony_restrictive_generators(),
+      &parser_->pending_error_handler_, parser_->use_counts_, ok_);
   if (!*ok_) return;
   DCHECK_NOT_NULL(var);
   DCHECK(proxy->is_resolved());
   DCHECK(initializer_position_ != kNoSourcePosition);
   var->set_initializer_position(initializer_position_);
 
   // TODO(adamk): This should probably be checking hoist_scope.
   // Move it to Parser::Declare() to make it easier to test
   // the right scope.
   Scope* declaration_scope = IsLexicalVariableMode(descriptor_->mode)
@@ skipping 533 matching lines @@
 NOT_A_PATTERN(TryFinallyStatement)
 NOT_A_PATTERN(UnaryOperation)
 NOT_A_PATTERN(VariableDeclaration)
 NOT_A_PATTERN(WhileStatement)
 NOT_A_PATTERN(WithStatement)
 NOT_A_PATTERN(Yield)
 
 #undef NOT_A_PATTERN
 }  // namespace internal
 }  // namespace v8