Revert of Separate Scope into DeclarationScope and Scope

src/compiler/ast-graph-builder.h

 // Copyright 2014 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.
 
 #ifndef V8_COMPILER_AST_GRAPH_BUILDER_H_
 #define V8_COMPILER_AST_GRAPH_BUILDER_H_
 
 #include "src/ast/ast.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/liveness-analyzer.h"
@@ skipping 450 matching lines @@
 // The abstract execution environment for generated code consists of
 // parameter variables, local variables and the operand stack. The
 // environment will perform proper SSA-renaming of all tracked nodes
 // at split and merge points in the control flow. Internally all the
 // values are stored in one list using the following layout:
 //
 //  [parameters (+receiver)] [locals] [operand stack]
 //
 class AstGraphBuilder::Environment : public ZoneObject {
  public:
-  Environment(AstGraphBuilder* builder, DeclarationScope* scope,
-              Node* control_dependency);
+  Environment(AstGraphBuilder* builder, Scope* scope, Node* control_dependency);
 
   int parameters_count() const { return parameters_count_; }
   int locals_count() const { return locals_count_; }
   int context_chain_length() { return static_cast<int>(contexts_.size()); }
   int stack_height() {
     return static_cast<int>(values()->size()) - parameters_count_ -
            locals_count_;
   }
 
   // Operations on parameter or local variables.
@@ skipping 122 matching lines @@
 
   // Prepare environment to be used as loop header.
   void PrepareForLoop(BitVector* assigned, bool is_osr = false);
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_AST_GRAPH_BUILDER_H_