Revert of Separate Scope into DeclarationScope and Scope

src/full-codegen/full-codegen.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/full-codegen/full-codegen.h"
 
 #include "src/ast/ast-numbering.h"
 #include "src/ast/ast.h"
 #include "src/ast/prettyprinter.h"
 #include "src/ast/scopes.h"
@@ skipping 1900 matching lines @@
   // The condition on the declaration scopes is a conservative check for
   // nested functions that access a binding and are called before the
   // binding is initialized:
   //   function() { f(); let x = 1; function f() { x = 2; } }
   //
   // The check cannot be skipped on non-linear scopes, namely switch
   // scopes, to ensure tests are done in cases like the following:
   //   switch (1) { case 0: let x = 2; case 1: f(x); }
   // The scope of the variable needs to be checked, in case the use is
   // in a sub-block which may be linear.
-  if (var->scope()->GetDeclarationScope() != scope()->GetDeclarationScope()) {
+  if (var->scope()->DeclarationScope() != scope()->DeclarationScope()) {
     return true;
   }
 
   if (var->is_this()) {
     DCHECK(literal() != nullptr &&
            (literal()->kind() & kSubclassConstructor) != 0);
     // TODO(littledan): implement 'this' hole check elimination.
     return true;
   }
 
   // Check that we always have valid source position.
   DCHECK(var->initializer_position() != kNoSourcePosition);
   DCHECK(proxy->position() != kNoSourcePosition);
 
   return var->scope()->is_nonlinear() ||
          var->initializer_position() >= proxy->position();
 }
 
 
 #undef __
 
 
 }  // namespace internal
 }  // namespace v8