Revert of Separate Scope into DeclarationScope and Scope

src/crankshaft/hydrogen.cc

Index: src/crankshaft/hydrogen.cc
diff --git a/src/crankshaft/hydrogen.cc b/src/crankshaft/hydrogen.cc
index 618ac6b8652c0e2411220591aa914510c2575827..d455140af9dc5342d44c8a523fa066a8e2d53087 100644
--- a/src/crankshaft/hydrogen.cc
+++ b/src/crankshaft/hydrogen.cc
@@ -4399,7 +4399,7 @@
     return false;
   }
 
-  DeclarationScope* scope = current_info()->scope();
+  Scope* scope = current_info()->scope();
   SetUpScope(scope);
 
   // Add an edge to the body entry.  This is warty: the graph's start
@@ -4604,7 +4604,8 @@
   return call;
 }
 
-void HOptimizedGraphBuilder::SetUpScope(DeclarationScope* scope) {
+
+void HOptimizedGraphBuilder::SetUpScope(Scope* scope) {
   HEnvironment* prolog_env = environment();
   int parameter_count = environment()->parameter_count();
   ZoneList<HValue*> parameters(parameter_count, zone());
@@ -4690,7 +4691,7 @@
     if (scope != NULL) {
       if (scope->NeedsContext()) {
         // Load the function object.
-        DeclarationScope* declaration_scope = scope->GetDeclarationScope();
+        Scope* declaration_scope = scope->DeclarationScope();
         HInstruction* function;
         HValue* outer_context = environment()->context();
         if (declaration_scope->is_script_scope() ||
@@ -12780,7 +12781,7 @@
       push_count_(0),
       ast_id_(BailoutId::None()),
       zone_(zone) {
-  DeclarationScope* declaration_scope = scope->GetDeclarationScope();
+  Scope* declaration_scope = scope->DeclarationScope();
   Initialize(declaration_scope->num_parameters() + 1,
              declaration_scope->num_stack_slots(), 0);
 }