Don't reuse the name scope for multiple variables in DoParseLazy

src/parsing/parser.cc

Index: src/parsing/parser.cc
diff --git a/src/parsing/parser.cc b/src/parsing/parser.cc
index 1d26e77039d855a2be83214a2a186e200c498e5e..8599765e3bb489750d1fc4563a73adcd4248af71 100644
--- a/src/parsing/parser.cc
+++ b/src/parsing/parser.cc
@@ -670,13 +670,13 @@ FunctionLiteral* Parser::DoParseProgram(ParseInfo* info) {
   FunctionLiteral* result = NULL;
   {
     Scope* outer = original_scope_;
+    DCHECK(outer);

[marja, 2016/08/30 11:28:21]

Nit: DCHECK_NOT_NULL

     // If there's a chance that there's a reference to global 'this', predeclare
     // it as a dynamic global on the script scope.
     if (outer->GetReceiverScope()->is_script_scope()) {
       info->script_scope()->DeclareDynamicGlobal(
           ast_value_factory()->this_string(), Variable::THIS);
     }
-    DCHECK(outer);
     if (info->is_eval()) {
       if (!outer->is_script_scope() || is_strict(info->language_mode())) {
         parsing_mode = PARSE_EAGERLY;
@@ -839,17 +839,17 @@ FunctionLiteral* Parser::DoParseLazy(ParseInfo* info,
 
   {
     // Parse the function literal.
-    Scope* scope = original_scope_;
-    DCHECK(scope);
+    Scope* outer = original_scope_;
+    DCHECK(outer);
     // If there's a chance that there's a reference to global 'this', predeclare
     // it as a dynamic global on the script scope.
-    if (info->is_arrow() && scope->GetReceiverScope()->is_script_scope()) {
+    if (info->is_arrow() && outer->GetReceiverScope()->is_script_scope()) {
       info->script_scope()->DeclareDynamicGlobal(
           ast_value_factory()->this_string(), Variable::THIS);
     }
-    FunctionState function_state(&function_state_, &scope_state_, scope,
+    FunctionState function_state(&function_state_, &scope_state_, outer,
                                  info->function_kind());
-    DCHECK(is_sloppy(scope->language_mode()) ||
+    DCHECK(is_sloppy(outer->language_mode()) ||
            is_strict(info->language_mode()));
     FunctionLiteral::FunctionType function_type = ComputeFunctionType(info);
     bool ok = true;
@@ -927,7 +927,7 @@ FunctionLiteral* Parser::DoParseLazy(ParseInfo* info,
         }
       }
     } else if (info->is_default_constructor()) {
-      DCHECK_EQ(this->scope(), scope);
+      DCHECK_EQ(this->scope(), outer);

[marja, 2016/08/30 11:28:21]

Can this now be scope() instead of this->scope() or is scope still in scope?

       result = DefaultConstructor(
           raw_name, IsSubclassConstructor(info->function_kind()),
           info->start_position(), info->end_position(), info->language_mode());