Revert of Separate Scope into DeclarationScope and Scope

test/cctest/asmjs/test-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 <cstring>
 #include <functional>
 #include <iostream>
 #include <memory>
 
 #include "src/asmjs/asm-typer.h"
@@ skipping 306 matching lines @@
   std::string source_;
   ValidationType validation_type_;
   HandleAndZoneScope handles_;
   Zone* zone_;
   Isolate* isolate_;
   AstValueFactory ast_value_factory_;
   Factory* factory_;
   Handle<String> source_code_;
   Handle<Script> script_;
 
-  DeclarationScope* outer_scope_;
+  Scope* outer_scope_;
   FunctionLiteral* module_;
   FunctionDeclaration* fun_decl_;
   std::unique_ptr<AsmTyper> typer_;
   std::unique_ptr<AsmTyper::FunctionScope> fun_scope_;
 };
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8
 
@@ skipping 1594 matching lines @@
   for (size_t ii = 0; ii < arraysize(kTests); ++ii) {
     if (!ValidationOf(Module(kTests[ii]))
              ->FailsWithMessage("Invalid heap access index")) {
       std::cerr << "Test:\n" << kTests[ii];
       CHECK(false);
     }
   }
 }
 
 }  // namespace