Revert of Separate Scope into DeclarationScope and Scope

test/cctest/test-parsing.cc

Index: test/cctest/test-parsing.cc
diff --git a/test/cctest/test-parsing.cc b/test/cctest/test-parsing.cc
index 97fa05d10bf74a1402d26e589bdc8c59bbe04bc0..1f9bf5d0b957e3ffe0457399294fc19f22f33637 100644
--- a/test/cctest/test-parsing.cc
+++ b/test/cctest/test-parsing.cc
@@ -1120,7 +1120,7 @@
       CHECK(i::Scope::Analyze(&info));
       CHECK(info.literal() != NULL);
 
-      i::DeclarationScope* script_scope = info.literal()->scope();
+      i::Scope* script_scope = info.literal()->scope();
       CHECK(script_scope->is_script_scope());
 
       i::Scope* scope = script_scope->inner_scope();
@@ -1134,8 +1134,8 @@
       }
       // Arrows themselves never get an arguments object.
       if ((source_data[i].expected & ARGUMENTS) != 0 &&
-          !scope->AsDeclarationScope()->is_arrow_scope()) {
-        CHECK_NOT_NULL(scope->AsDeclarationScope()->arguments());
+          !scope->is_arrow_scope()) {
+        CHECK_NOT_NULL(scope->arguments());
       }
       CHECK_EQ((source_data[i].expected & SUPER_PROPERTY) != 0,
                scope->uses_super_property());
@@ -5942,7 +5942,7 @@
   CHECK(parser.Parse(&info));
   CHECK(i::Compiler::Analyze(&info));
   i::FunctionLiteral* func = info.literal();
-  i::DeclarationScope* module_scope = func->scope();
+  i::Scope* module_scope = func->scope();
   i::Scope* outer_scope = module_scope->outer_scope();
   CHECK(outer_scope->is_script_scope());
   CHECK_NULL(outer_scope->outer_scope());