From d2984eb773519b3f41ff4f30f495fa61e6c45fa3 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 21:21:14 +0200 Subject: [PATCH] chore: bump chromium to 124.0.6367.233 (30-x-y) (#42269) * chore: bump chromium in DEPS to 124.0.6367.233 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> --- DEPS | 2 +- patches/v8/.patches | 1 - patches/v8/cherry-pick-3e037e195e50.patch | 41 ----------------------- 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 patches/v8/cherry-pick-3e037e195e50.patch diff --git a/DEPS b/DEPS index 094b09f98a79..ee0fa27896e2 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src' vars = { 'chromium_version': - '124.0.6367.230', + '124.0.6367.233', 'node_version': 'v20.11.1', 'nan_version': diff --git a/patches/v8/.patches b/patches/v8/.patches index bc4a5ac1e2fc..280a34b93603 100644 --- a/patches/v8/.patches +++ b/patches/v8/.patches @@ -1,3 +1,2 @@ chore_allow_customizing_microtask_policy_per_context.patch deps_add_v8_object_setinternalfieldfornodecore.patch -cherry-pick-3e037e195e50.patch diff --git a/patches/v8/cherry-pick-3e037e195e50.patch b/patches/v8/cherry-pick-3e037e195e50.patch deleted file mode 100644 index 6b482de829a5..000000000000 --- a/patches/v8/cherry-pick-3e037e195e50.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 39e3a8d5d59acbe9405f351fa6c57121c1900657..2aa1bb6c0f8f6e098a3ddf3f54ec2d0d5af9dc24 100644 ---- 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 -index 009befd607bbe9135d604550018e36d681340718..6001ea622dfe0d1e4ccd4b42351b7368fd0892ce 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