Revert of Separate Scope into DeclarationScope and Scope

src/asmjs/asm-typer.cc

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/asmjs/asm-typer.h"
 
 #include <algorithm>
 #include <limits>
 #include <memory>
 #include <string>
@@ skipping 540 matching lines @@
   Section tables_;
   Section exports_;
 
   DISALLOW_COPY_AND_ASSIGN(SourceLayoutTracker);
 };
 }  // namespace
 
 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.");
   module_name_ = fun->name();
 
   // Allowed parameters: Stdlib, FFI, Mem
   static const uint32_t MaxModuleParameters = 3;
   if (scope->num_parameters() > MaxModuleParameters) {
     FAIL(fun, "asm.js modules may not have more than three parameters.");
   }
@@ skipping 2172 matching lines @@
     return true;
   }
 
   *error_message = typer.error_message();
   return false;
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8