Revert of Separate Scope into DeclarationScope and Scope

src/compiler/ast-loop-assignment-analyzer.h

Index: src/compiler/ast-loop-assignment-analyzer.h
diff --git a/src/compiler/ast-loop-assignment-analyzer.h b/src/compiler/ast-loop-assignment-analyzer.h
index 0893fd1074de972244bc68f37f8fe45cf6e85ee6..57062edabd7b7fe0f287cacc8d6a1d2c6bae61d0 100644
--- a/src/compiler/ast-loop-assignment-analyzer.h
+++ b/src/compiler/ast-loop-assignment-analyzer.h
@@ -30,7 +30,7 @@
     return nullptr;
   }
 
-  int GetAssignmentCountForTesting(DeclarationScope* scope, Variable* var);
+  int GetAssignmentCountForTesting(Scope* scope, Variable* var);
 
  private:
   friend class AstLoopAssignmentAnalyzer;
@@ -51,7 +51,7 @@
   AST_NODE_LIST(DECLARE_VISIT)
 #undef DECLARE_VISIT
 
-  static int GetVariableIndex(DeclarationScope* scope, Variable* var);
+  static int GetVariableIndex(Scope* scope, Variable* var);
 
  private:
   CompilationInfo* info_;