Revert of Separate Scope into DeclarationScope and Scope

src/crankshaft/hydrogen.cc

 // Copyright 2013 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/crankshaft/hydrogen.h"
 
 #include <memory>
 #include <sstream>
 
 #include "src/allocation-site-scopes.h"
@@ skipping 4381 matching lines @@
   }
 }
 
 
 bool HOptimizedGraphBuilder::BuildGraph() {
   if (IsSubclassConstructor(current_info()->literal()->kind())) {
     Bailout(kSuperReference);
     return false;
   }
 
-  DeclarationScope* scope = current_info()->scope();
+  Scope* scope = current_info()->scope();
   SetUpScope(scope);
 
   // Add an edge to the body entry.  This is warty: the graph's start
   // environment will be used by the Lithium translation as the initial
   // environment on graph entry, but it has now been mutated by the
   // Hydrogen translation of the instructions in the start block.  This
   // environment uses values which have not been defined yet.  These
   // Hydrogen instructions will then be replayed by the Lithium
   // translation, so they cannot have an environment effect.  The edge to
   // the body's entry block (along with some special logic for the start
@@ skipping 184 matching lines @@
   AddInstruction(push_args);
 }
 
 
 template <class Instruction>
 HInstruction* HOptimizedGraphBuilder::PreProcessCall(Instruction* call) {
   PushArgumentsFromEnvironment(call->argument_count());
   return call;
 }
 
-void HOptimizedGraphBuilder::SetUpScope(DeclarationScope* scope) {
+
+void HOptimizedGraphBuilder::SetUpScope(Scope* scope) {
   HEnvironment* prolog_env = environment();
   int parameter_count = environment()->parameter_count();
   ZoneList<HValue*> parameters(parameter_count, zone());
   for (int i = 0; i < parameter_count; ++i) {
     HInstruction* parameter = Add<HParameter>(static_cast<unsigned>(i));
     parameters.Add(parameter, zone());
     environment()->Bind(i, parameter);
   }
 
   HConstant* undefined_constant = graph()->GetConstantUndefined();
@@ skipping 65 matching lines @@
   DCHECK(current_block()->HasPredecessor());
 
   Scope* outer_scope = scope();
   Scope* scope = stmt->scope();
   BreakAndContinueInfo break_info(stmt, outer_scope);
 
   { BreakAndContinueScope push(&break_info, this);
     if (scope != NULL) {
       if (scope->NeedsContext()) {
         // Load the function object.
-        DeclarationScope* declaration_scope = scope->GetDeclarationScope();
+        Scope* declaration_scope = scope->DeclarationScope();
         HInstruction* function;
         HValue* outer_context = environment()->context();
         if (declaration_scope->is_script_scope() ||
             declaration_scope->is_eval_scope()) {
           function = new (zone())
               HLoadContextSlot(outer_context, Context::CLOSURE_INDEX,
                                HLoadContextSlot::kNoCheck);
         } else {
           function = New<HThisFunction>();
         }
@@ skipping 8069 matching lines @@
       frame_type_(JS_FUNCTION),
       parameter_count_(0),
       specials_count_(1),
       local_count_(0),
       outer_(outer),
       entry_(NULL),
       pop_count_(0),
       push_count_(0),
       ast_id_(BailoutId::None()),
       zone_(zone) {
-  DeclarationScope* declaration_scope = scope->GetDeclarationScope();
+  Scope* declaration_scope = scope->DeclarationScope();
   Initialize(declaration_scope->num_parameters() + 1,
              declaration_scope->num_stack_slots(), 0);
 }
 
 
 HEnvironment::HEnvironment(Zone* zone, int parameter_count)
     : values_(0, zone),
       frame_type_(STUB),
       parameter_count_(parameter_count),
       specials_count_(1),
@@ skipping 625 matching lines @@
     isolate()->GetHTracer()->TraceHydrogen(name(), graph_);
   }
 
 #ifdef DEBUG
   graph_->Verify(false);  // No full verify.
 #endif
 }
 
 }  // namespace internal
 }  // namespace v8