From 81c184ffc10b9ef01c42003a27ffc6d58ce3d7ea Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Thu, 23 May 2024 09:28:35 -0700 Subject: [PATCH] chore: cherry-pick 3e037e195e50 from v8 (#42254) * chore: cherry-pick 3e037e195e50 from v8 * chore: update patches --------- Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> --- patches/v8/.patches | 1 + patches/v8/cherry-pick-3e037e195e50.patch | 41 +++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 patches/v8/cherry-pick-3e037e195e50.patch diff --git a/patches/v8/.patches b/patches/v8/.patches index 84ac6554c52b..c4097bdb191d 100644 --- a/patches/v8/.patches +++ b/patches/v8/.patches @@ -3,3 +3,4 @@ deps_add_v8_object_setinternalfieldfornodecore.patch cherry-pick-f320600cd1f4.patch revert_heap_add_checks_position_info.patch cherry-pick-b3c01ac1e60a.patch +cherry-pick-3e037e195e50.patch diff --git a/patches/v8/cherry-pick-3e037e195e50.patch b/patches/v8/cherry-pick-3e037e195e50.patch new file mode 100644 index 000000000000..d1c938e7a7fe --- /dev/null +++ b/patches/v8/cherry-pick-3e037e195e50.patch @@ -0,0 +1,41 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Shu-yu Guo +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 +Commit-Queue: Adam Klein +Reviewed-by: Adam Klein +Cr-Commit-Position: refs/heads/main@{#94014} + +diff --git a/src/ast/scopes.cc b/src/ast/scopes.cc +index 660fdd2e9ad30b9487eafd351b1e517d2a489204..de4df35c0addc53c5620a19e3e06a8f9eff2a8fb 100644 +--- a/src/ast/scopes.cc ++++ b/src/ast/scopes.cc +@@ -2447,7 +2447,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 78bad16404d31505e34d4d69a948ad7a689776cc..7ccf203fadcf256b4dba40f66d8e5b4d3780282c 100644 +--- a/src/parsing/parser-base.h ++++ b/src/parsing/parser-base.h +@@ -2661,6 +2661,7 @@ typename ParserBase::BlockT ParserBase::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