Revert of Separate Scope into DeclarationScope and Scope

src/ast/ast-numbering.cc

 // Copyright 2012 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/ast/ast-numbering.h"
 
 #include "src/ast/ast.h"
 #include "src/ast/scopes.h"
 
 namespace v8 {
@@ skipping 541 matching lines @@
 
 void AstNumberingVisitor::VisitRewritableExpression(
     RewritableExpression* node) {
   IncrementNodeCount();
   node->set_base_id(ReserveIdRange(RewritableExpression::num_ids()));
   Visit(node->expression());
 }
 
 
 bool AstNumberingVisitor::Renumber(FunctionLiteral* node) {
-  DeclarationScope* scope = node->scope();
+  Scope* scope = node->scope();
   if (scope->new_target_var()) DisableCrankshaft(kSuperReference);
   if (scope->calls_eval()) DisableOptimization(kFunctionCallsEval);
   if (scope->arguments() != NULL && !scope->arguments()->IsStackAllocated()) {
     DisableCrankshaft(kContextAllocatedArguments);
   }
 
   int rest_index;
   if (scope->rest_parameter(&rest_index)) {
     DisableCrankshaft(kRestParameter);
   }
@@ skipping 15 matching lines @@
 }
 
 
 bool AstNumbering::Renumber(Isolate* isolate, Zone* zone,
                             FunctionLiteral* function) {
   AstNumberingVisitor visitor(isolate, zone);
   return visitor.Renumber(function);
 }
 }  // namespace internal
 }  // namespace v8