Revert of Separate Scope into DeclarationScope and Scope

src/ast/modules.cc

Index: src/ast/modules.cc
diff --git a/src/ast/modules.cc b/src/ast/modules.cc
index 3c04847a5fdaa0d6f21129f009cc8e248d150e9f..286a117b3f506791c5ce1c02cd1100e1532dfdbb 100644
--- a/src/ast/modules.cc
+++ b/src/ast/modules.cc
@@ -79,9 +79,10 @@
   exports_.Add(entry, zone);
 }
 
-bool ModuleDescriptor::Validate(DeclarationScope* module_scope,
-                                PendingCompilationErrorHandler* error_handler,
-                                Zone* zone) const {
+
+bool ModuleDescriptor::Validate(
+    Scope* module_scope, PendingCompilationErrorHandler* error_handler,
+    Zone* zone) const {
   DCHECK(module_scope->is_module_scope());
   DCHECK_EQ(this, module_scope->module());
   DCHECK_NOT_NULL(error_handler);