Revert of Separate Scope into DeclarationScope and Scope

src/full-codegen/arm64/full-codegen-arm64.cc

Index: src/full-codegen/arm64/full-codegen-arm64.cc
diff --git a/src/full-codegen/arm64/full-codegen-arm64.cc b/src/full-codegen/arm64/full-codegen-arm64.cc
index dc12a1d4aed65c6e8d9801ee211a4f849afcbe0e..b5b853d3660d6340bb8970d0665b65540da85af7 100644
--- a/src/full-codegen/arm64/full-codegen-arm64.cc
+++ b/src/full-codegen/arm64/full-codegen-arm64.cc
@@ -205,8 +205,7 @@
     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) ? 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;
@@ -238,7 +237,7 @@
 
   // Possibly set up a local binding to the this function which is used in
   // derived constructors with super calls.
-  Variable* this_function_var = info->scope()->this_function_var();
+  Variable* this_function_var = scope()->this_function_var();
   if (this_function_var != nullptr) {
     Comment cmnt(masm_, "[ This function");
     if (!function_in_register_x1) {
@@ -249,7 +248,7 @@
   }
 
   // Possibly set up a local binding to the new target value.
-  Variable* new_target_var = info->scope()->new_target_var();
+  Variable* new_target_var = scope()->new_target_var();
   if (new_target_var != nullptr) {
     Comment cmnt(masm_, "[ new.target");
     SetVar(new_target_var, x3, x0, x2);
@@ -257,7 +256,7 @@
 
   // Possibly allocate RestParameters
   int rest_index;
-  Variable* rest_param = info->scope()->rest_parameter(&rest_index);
+  Variable* rest_param = scope()->rest_parameter(&rest_index);
   if (rest_param) {
     Comment cmnt(masm_, "[ Allocate rest parameter array");
     if (!function_in_register_x1) {
@@ -269,7 +268,7 @@
     SetVar(rest_param, x0, x1, x2);
   }
 
-  Variable* arguments = info->scope()->arguments();
+  Variable* arguments = scope()->arguments();
   if (arguments != NULL) {
     // Function uses arguments object.
     Comment cmnt(masm_, "[ Allocate arguments object");
@@ -3690,7 +3689,7 @@
 
 
 void FullCodeGenerator::PushFunctionArgumentForContextAllocation() {
-  DeclarationScope* closure_scope = scope()->GetClosureScope();
+  Scope* closure_scope = scope()->ClosureScope();
   if (closure_scope->is_script_scope() ||
       closure_scope->is_module_scope()) {
     // Contexts nested in the native context have a canonical empty function