Revert of Separate Scope into DeclarationScope and Scope

src/parsing/parameter-initializer-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/parsing/parameter-initializer-rewriter.h"
 
 #include "src/ast/ast.h"
 #include "src/ast/ast-traversal-visitor.h"
 #include "src/ast/scopes.h"
 
@@ skipping 50 matching lines @@
 
 
 void Rewriter::VisitVariableProxy(VariableProxy* proxy) {
   if (!proxy->is_resolved()) {
     if (param_scope_->outer_scope()->RemoveUnresolved(proxy)) {
       param_scope_->AddUnresolved(proxy);
     }
   } else {
     // Ensure that temporaries we find are already in the correct scope.
     DCHECK(proxy->var()->mode() != TEMPORARY ||
-           proxy->var()->scope() == param_scope_->GetClosureScope());
+           proxy->var()->scope() == param_scope_->ClosureScope());
   }
 }
 
 
 void Rewriter::VisitBlock(Block* stmt) {
   if (stmt->scope() != nullptr)
     stmt->scope()->ReplaceOuterScope(param_scope_);
   else
     VisitStatements(stmt->statements());
 }
@@ skipping 22 matching lines @@
   DCHECK(param_scope->calls_sloppy_eval());
   DCHECK(param_scope->outer_scope()->is_function_scope());
 
   Rewriter rewriter(stack_limit, expr, param_scope);
   rewriter.Run();
 }
 
 
 }  // namespace internal
 }  // namespace v8