|
@@ -0,0 +1,41 @@
|
|
|
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
+From: Shu-yu Guo <[email protected]>
|
|
|
+Date: Tue, 21 May 2024 10:06:20 -0700
|
|
|
+Subject: Using FunctionParsingScope for parsing class static blocks
|
|
|
+
|
|
|
+Class static blocks contain statements, don't inherit the
|
|
|
+ExpressionScope stack.
|
|
|
+
|
|
|
+Bug: 341663589
|
|
|
+Change-Id: Id52a60d77781201a706fcf2290d7d103f39bed83
|
|
|
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5553030
|
|
|
+Commit-Queue: Shu-yu Guo <[email protected]>
|
|
|
+Commit-Queue: Adam Klein <[email protected]>
|
|
|
+Reviewed-by: Adam Klein <[email protected]>
|
|
|
+Cr-Commit-Position: refs/heads/main@{#94014}
|
|
|
+
|
|
|
+diff --git a/src/ast/scopes.cc b/src/ast/scopes.cc
|
|
|
+index 6dfcd45cf208e58a2fc0cd18ba3b115bae35a0d5..61b8fbf0cfcaa02a92ead411e4bcbc1f36dfdad3 100644
|
|
|
+--- a/src/ast/scopes.cc
|
|
|
++++ b/src/ast/scopes.cc
|
|
|
+@@ -2441,7 +2441,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
|
|
|
+index ac35090ca5d129c58c0e4fb31ee2e2456e202dce..059133f32d30c94e400de96313734b64c5421b09 100644
|
|
|
+--- a/src/parsing/parser-base.h
|
|
|
++++ b/src/parsing/parser-base.h
|
|
|
+@@ -2619,6 +2619,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
|