Revert of Separate Scope into DeclarationScope and Scope

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

 // Copyright 2014 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/s390/lithium-codegen-s390.h"
 
 #include "src/base/bits.h"
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
@@ skipping 158 matching lines @@
       // Result of FastNewFunctionContextStub is always in new space.
       need_write_barrier = false;
     }
     RecordSafepoint(deopt_mode);
 
     // Context is returned in both r2 and cp.  It replaces the context
     // passed to us.  It's saved in the stack and kept live in cp.
     __ LoadRR(cp, r2);
     __ StoreP(r2, MemOperand(fp, StandardFrameConstants::kContextOffset));
     // Copy any necessary parameters into the context.
-    int num_parameters = info()->scope()->num_parameters();
-    int first_parameter = info()->scope()->has_this_declaration() ? -1 : 0;
+    int num_parameters = scope()->num_parameters();
+    int first_parameter = scope()->has_this_declaration() ? -1 : 0;
     for (int i = first_parameter; i < num_parameters; i++) {
-      Variable* var = (i == -1) ? info()->scope()->receiver()
-                                : info()->scope()->parameter(i);
+      Variable* var = (i == -1) ? scope()->receiver() : scope()->parameter(i);
       if (var->IsContextSlot()) {
         int parameter_offset = StandardFrameConstants::kCallerSPOffset +
                                (num_parameters - 1 - i) * kPointerSize;
         // Load parameter from stack.
         __ LoadP(r2, MemOperand(fp, parameter_offset));
         // Store it in the context.
         MemOperand target = ContextMemOperand(cp, var->index());
         __ StoreP(r2, target);
         // Update the write barrier. This clobbers r5 and r2.
         if (need_write_barrier) {
@@ skipping 5475 matching lines @@
   __ LoadP(result,
            FieldMemOperand(scratch, FixedArray::kHeaderSize - kPointerSize));
   __ bind(deferred->exit());
   __ bind(&done);
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8