Revert of Separate Scope into DeclarationScope and Scope

src/asmjs/asm-wasm-builder.cc

 // Copyright 2015 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/v8.h"
 
 // Required to get M_E etc. in MSVC.
 #if defined(_WIN32)
 #define _USE_MATH_DEFINES
 #endif
@@ skipping 425 matching lines @@
 
   void VisitForOfStatement(ForOfStatement* stmt) { UNREACHABLE(); }
 
   void VisitTryCatchStatement(TryCatchStatement* stmt) { UNREACHABLE(); }
 
   void VisitTryFinallyStatement(TryFinallyStatement* stmt) { UNREACHABLE(); }
 
   void VisitDebuggerStatement(DebuggerStatement* stmt) { UNREACHABLE(); }
 
   void VisitFunctionLiteral(FunctionLiteral* expr) {
-    DeclarationScope* scope = expr->scope();
+    Scope* scope = expr->scope();
     if (scope_ == kFuncScope) {
       if (auto* func_type = typer_->TypeOf(expr)->AsFunctionType()) {
         // Build the signature for the function.
         LocalType return_type = TypeFrom(func_type->ReturnType());
         const auto& arguments = func_type->Arguments();
         FunctionSig::Builder b(zone(), return_type == kAstStmt ? 0 : 1,
                                arguments.size());
         if (return_type != kAstStmt) b.AddReturn(return_type);
         for (int i = 0; i < expr->parameter_count(); ++i) {
           LocalType type = TypeFrom(arguments[i]);
@@ skipping 1325 matching lines @@
   AsmWasmBuilderImpl impl(isolate_, zone_, literal_, typer_);
   impl.Build();
   *foreign_args = impl.GetForeignArgs();
   ZoneBuffer* buffer = new (zone_) ZoneBuffer(zone_);
   impl.builder_->WriteTo(*buffer);
   return buffer;
 }
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8