Revert of Separate Scope into DeclarationScope and Scope

src/asmjs/asm-typer.cc

Index: src/asmjs/asm-typer.cc
diff --git a/src/asmjs/asm-typer.cc b/src/asmjs/asm-typer.cc
index bdd657f8f1bf73ade9e0b7014c90367a38bf5a6b..031d901797c1bfd4077a248d89630b9ab5d6f753 100644
--- a/src/asmjs/asm-typer.cc
+++ b/src/asmjs/asm-typer.cc
@@ -558,7 +558,7 @@
 AsmType* AsmTyper::ValidateModule(FunctionLiteral* fun) {
   SourceLayoutTracker source_layout;
 
-  DeclarationScope* scope = fun->scope();
+  Scope* scope = fun->scope();
   if (!scope->is_function_scope()) FAIL(fun, "Not at function scope.");
   if (!ValidAsmIdentifier(fun->name()))
     FAIL(fun, "Invalid asm.js identifier in module name.");