Fix temp_zone scoping when parsing inner function literals

conradw · Commit bot · commit b185ed40611d · 2015-09-17T09:38:33.000Z
BUG=v8:4392 LOG=Y Review URL: https://codereview.chromium.org/1354523003 Cr-Commit-Position: refs/heads/master@{#30792}
diff --git a/src/ast.h b/src/ast.h
@@ -3676,9 +3676,9 @@ class AstNodeFactory final BASE_EMBEDDED {
   // Handles use of temporary zones when parsing inner function bodies.
   class BodyScope {
    public:
-    BodyScope(AstNodeFactory* factory, Zone* temp_zone, bool can_use_temp_zone)
+    BodyScope(AstNodeFactory* factory, Zone* temp_zone, bool use_temp_zone)
         : factory_(factory), prev_zone_(factory->local_zone_) {
-      if (can_use_temp_zone) {
+      if (use_temp_zone) {
         factory->local_zone_ = temp_zone;
       }
     }
diff --git a/src/parser.cc b/src/parser.cc
@@ -4224,7 +4224,7 @@ FunctionLiteral* Parser::ParseFunctionLiteral(
       //   FunctionExpression; even without enclosing parentheses it might be
       //   immediately invoked.
       // - The function literal shouldn't be hinted to eagerly compile.
-      bool can_use_temp_zone =
+      bool use_temp_zone =
           FLAG_lazy && !allow_natives() && extension_ == NULL && allow_lazy() &&
           function_type == FunctionLiteral::DECLARATION &&
           eager_compile_hint != FunctionLiteral::kShouldEagerCompile;
@@ -4237,14 +4237,14 @@ FunctionLiteral* Parser::ParseFunctionLiteral(
       // parser-persistent zone (see parser_zone_ in AstNodeFactory).
       {
         Zone temp_zone;
-        AstNodeFactory::BodyScope(factory(), &temp_zone, can_use_temp_zone);
+        AstNodeFactory::BodyScope inner(factory(), &temp_zone, use_temp_zone);
 
         body = ParseEagerFunctionBody(function_name, pos, formals, kind,
                                       function_type, CHECK_OK);
       }
       materialized_literal_count = function_state.materialized_literal_count();
       expected_property_count = function_state.expected_property_count();
-      if (can_use_temp_zone) {
+      if (use_temp_zone) {
         // If the preconditions are correct the function body should never be
         // accessed, but do this anyway for better behaviour if they're wrong.
         body = NULL;

Original file line number	Diff line number	Diff line change
`@@ -3676,9 +3676,9 @@ class AstNodeFactory final BASE_EMBEDDED {`
`3676`	`3676`	`// Handles use of temporary zones when parsing inner function bodies.`
`3677`	`3677`	`class BodyScope {`
`3678`	`3678`	`public:`
`3679`		`- BodyScope(AstNodeFactory* factory, Zone* temp_zone, bool can_use_temp_zone)`
	`3679`	`+ BodyScope(AstNodeFactory* factory, Zone* temp_zone, bool use_temp_zone)`
`3680`	`3680`	`: factory_(factory), prev_zone_(factory->local_zone_) {`
`3681`		`- if (can_use_temp_zone) {`
	`3681`	`+ if (use_temp_zone) {`
`3682`	`3682`	`factory->local_zone_ = temp_zone;`
`3683`	`3683`	`}`
`3684`	`3684`	`}`