Revert of Separate Scope into DeclarationScope and Scope

src/crankshaft/typing.h

Index: src/crankshaft/typing.h
diff --git a/src/crankshaft/typing.h b/src/crankshaft/typing.h
index 1e301ccbbb7f62ea2ec5cbde43cb8b063f77f2be..c03ee2d995698e8f181b71839f587f21934e5043 100644
--- a/src/crankshaft/typing.h
+++ b/src/crankshaft/typing.h
@@ -20,7 +20,7 @@
 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();
 
@@ -37,7 +37,7 @@
   Isolate* isolate_;
   Zone* zone_;
   Handle<JSFunction> closure_;
-  DeclarationScope* scope_;
+  Scope* scope_;
   BailoutId osr_ast_id_;
   FunctionLiteral* root_;
   TypeFeedbackOracle oracle_;