Revert of Separate Scope into DeclarationScope and Scope

src/crankshaft/typing.h

 // Copyright 2013 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_CRANKSHAFT_TYPING_H_
 #define V8_CRANKSHAFT_TYPING_H_
 
 #include "src/allocation.h"
 #include "src/ast/ast-type-bounds.h"
 #include "src/ast/ast.h"
 #include "src/ast/scopes.h"
 #include "src/effects.h"
 #include "src/type-info.h"
 #include "src/types.h"
 #include "src/zone.h"
 
 namespace v8 {
 namespace internal {
 
 class AstTyper final : public AstVisitor<AstTyper> {
  public:
   AstTyper(Isolate* isolate, Zone* zone, Handle<JSFunction> closure,
-           DeclarationScope* scope, BailoutId osr_ast_id, FunctionLiteral* root,
+           Scope* scope, BailoutId osr_ast_id, FunctionLiteral* root,
            AstTypeBounds* bounds);
   void Run();
 
   DEFINE_AST_VISITOR_SUBCLASS_MEMBERS();
 
  private:
   Effect ObservedOnStack(Object* value);
   void ObserveTypesAtOsrEntry(IterationStatement* stmt);
 
   static const int kNoVar = INT_MIN;
   typedef v8::internal::Effects<int, kNoVar> Effects;
   typedef v8::internal::NestedEffects<int, kNoVar> Store;
 
   Isolate* isolate_;
   Zone* zone_;
   Handle<JSFunction> closure_;
-  DeclarationScope* scope_;
+  Scope* scope_;
   BailoutId osr_ast_id_;
   FunctionLiteral* root_;
   TypeFeedbackOracle oracle_;
   Store store_;
   AstTypeBounds* bounds_;
 
   Zone* zone() const { return zone_; }
   TypeFeedbackOracle* oracle() { return &oracle_; }
 
   void NarrowType(Expression* e, Bounds b) {
@@ skipping 27 matching lines @@
   AST_NODE_LIST(DECLARE_VISIT)
 #undef DECLARE_VISIT
 
   DISALLOW_COPY_AND_ASSIGN(AstTyper);
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_CRANKSHAFT_TYPING_H_