Merged: [parser] Using FunctionParsingScope for parsing class static blocks

syg · V8 LUCI CQ · commit 6e5e1053fa61 · 2024-05-22T19:01:12.000Z
Class static blocks contain statements, don't inherit the ExpressionScope stack. (cherry picked from commit 3e037e1) Bug: 341663589 Change-Id: Ice9a710293b028e5d9fd30d5d85c4842f970b152 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5558360 Reviewed-by: Adam Klein <adamk@chromium.org> Reviewed-by: Shu-yu Guo <syg@chromium.org> Commit-Queue: Adam Klein <adamk@chromium.org> Cr-Commit-Position: refs/branch-heads/12.4@{#38} Cr-Branched-From: 309640d-refs/heads/12.4.254@{#1} Cr-Branched-From: 5dc2470-refs/heads/main@{#92862}
diff --git a/src/ast/scopes.cc b/src/ast/scopes.cc
@@ -2445,7 +2445,7 @@ bool Scope::MustAllocate(Variable* var) {
     var->set_is_used();
     if (inner_scope_calls_eval_ && !var->is_this()) var->SetMaybeAssigned();
   }
-  DCHECK(!var->has_forced_context_allocation() || var->is_used());
+  CHECK(!var->has_forced_context_allocation() || var->is_used());
   // Global variables do not need to be allocated.
   return !var->IsGlobalObjectProperty() && var->is_used();
 }
diff --git a/src/parsing/parser-base.h b/src/parsing/parser-base.h
@@ -2661,6 +2661,7 @@ typename ParserBase<Impl>::BlockT ParserBase<Impl>::ParseClassStaticBlock(
   }
 
   FunctionState initializer_state(&function_state_, &scope_, initializer_scope);
+  FunctionParsingScope body_parsing_scope(impl());
   AcceptINScope accept_in(this, true);
 
   // Each static block has its own var and lexical scope, so make a new var

Original file line number	Diff line number	Diff line change
`@@ -2445,7 +2445,7 @@ bool Scope::MustAllocate(Variable* var) {`
`2445`	`2445`	`var->set_is_used();`
`2446`	`2446`	`if (inner_scope_calls_eval_ && !var->is_this()) var->SetMaybeAssigned();`
`2447`	`2447`	`}`
`2448`		`- DCHECK(!var->has_forced_context_allocation() \|\| var->is_used());`
	`2448`	`+ CHECK(!var->has_forced_context_allocation() \|\| var->is_used());`
`2449`	`2449`	`// Global variables do not need to be allocated.`
`2450`	`2450`	`return !var->IsGlobalObjectProperty() && var->is_used();`
`2451`	`2451`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2661,6 +2661,7 @@ typename ParserBase<Impl>::BlockT ParserBase<Impl>::ParseClassStaticBlock(`
`2661`	`2661`	`}`
`2662`	`2662`
`2663`	`2663`	`FunctionState initializer_state(&function_state_, &scope_, initializer_scope);`
	`2664`	`+ FunctionParsingScope body_parsing_scope(impl());`
`2664`	`2665`	`AcceptINScope accept_in(this, true);`
`2665`	`2666`
`2666`	`2667`	`// Each static block has its own var and lexical scope, so make a new var`