Separate Scope into DeclarationScope and Scope

src/crankshaft/x64/lithium-codegen-x64.cc

Index: src/crankshaft/x64/lithium-codegen-x64.cc
diff --git a/src/crankshaft/x64/lithium-codegen-x64.cc b/src/crankshaft/x64/lithium-codegen-x64.cc
index 6e35ae0554363e34ebac989b7f7fedcaf1bec139..12ab4326be3adcf7ceac031c46b65f809d9ea8dc 100644
--- a/src/crankshaft/x64/lithium-codegen-x64.cc
+++ b/src/crankshaft/x64/lithium-codegen-x64.cc
@@ -168,6 +168,7 @@ bool LCodeGen::GeneratePrologue() {
 
 void LCodeGen::DoPrologue(LPrologue* instr) {
   Comment(";;; Prologue begin");
+  DCHECK_EQ(scope(), info_->scope());
 
   // Possibly allocate a local context.
   if (info_->scope()->num_heap_slots() > 0) {
@@ -196,10 +197,11 @@ void LCodeGen::DoPrologue(LPrologue* instr) {
     __ movp(Operand(rbp, StandardFrameConstants::kContextOffset), rax);
 
     // Copy any necessary parameters into the context.
-    int num_parameters = scope()->num_parameters();
-    int first_parameter = scope()->has_this_declaration() ? -1 : 0;
+    int num_parameters = info_->scope()->num_parameters();
+    int first_parameter = info_->scope()->has_this_declaration() ? -1 : 0;
     for (int i = first_parameter; i < num_parameters; i++) {
-      Variable* var = (i == -1) ? scope()->receiver() : scope()->parameter(i);
+      Variable* var =
+          (i == -1) ? info_->scope()->receiver() : info_->scope()->parameter(i);
       if (var->IsContextSlot()) {
         int parameter_offset = StandardFrameConstants::kCallerSPOffset +
             (num_parameters - 1 - i) * kPointerSize;