Revert of Separate Scope into DeclarationScope and Scope

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

Index: src/compiler/ast-loop-assignment-analyzer.cc
diff --git a/src/compiler/ast-loop-assignment-analyzer.cc b/src/compiler/ast-loop-assignment-analyzer.cc
index 22438c720a878bfde9110b1c1a5a89487e90d2ce..0d539ec756460e7399e975653a1edd87874f50c0 100644
--- a/src/compiler/ast-loop-assignment-analyzer.cc
+++ b/src/compiler/ast-loop-assignment-analyzer.cc
@@ -297,15 +297,17 @@
   }
 }
 
-int ALAA::GetVariableIndex(DeclarationScope* scope, Variable* var) {
+
+int ALAA::GetVariableIndex(Scope* scope, Variable* var) {
   CHECK(var->IsStackAllocated());
   if (var->is_this()) return 0;
   if (var->IsParameter()) return 1 + var->index();
   return 1 + scope->num_parameters() + var->index();
 }
 
-int LoopAssignmentAnalysis::GetAssignmentCountForTesting(
-    DeclarationScope* scope, Variable* var) {
+
+int LoopAssignmentAnalysis::GetAssignmentCountForTesting(Scope* scope,
+                                                         Variable* var) {
   int count = 0;
   int var_index = AstLoopAssignmentAnalyzer::GetVariableIndex(scope, var);
   for (size_t i = 0; i < list_.size(); i++) {