mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
3a5f9e0a33
* chore: bump node in DEPS to v24.13.1 * chore: fixup patches refs: * https://github.com/nodejs/node/pull/60425 * https://github.com/nodejs/node/pull/61270 * https://github.com/nodejs/node/pull/61044 * fix: generate_config_gypi needs to generate valid JSON https://github.com/nodejs/node/pull/60794 * doc: align Buffer.concat documentation with behavior https://github.com/nodejs/node/pull/60405 * src: fix off-thread cert loading in bundled cert mode https://github.com/nodejs/node/pull/60764 * build: fix extraneous includes --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Maddock <smaddock@slack-corp.com>
|
|
Date: Thu, 27 Mar 2025 17:00:11 -0400
|
|
Subject: fix: cppgc initializing twice
|
|
|
|
Refs https://chromium-review.googlesource.com/c/v8/v8/+/6333562
|
|
|
|
cppgc will now be initialized as part of V8::Initialize. For now, skip
|
|
initialization if it's already been initialized.
|
|
|
|
This can be removed/refactored once Node.js upgrades to a version of V8
|
|
containing the above CL.
|
|
|
|
diff --git a/src/node.cc b/src/node.cc
|
|
index 8791119956ff93d65163d2ef424a8d821ebbdfad..ae082f2d0498e0e694e427da71078ca19086e275 100644
|
|
--- a/src/node.cc
|
|
+++ b/src/node.cc
|
|
@@ -1248,7 +1248,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
|
|
result->platform_ = per_process::v8_platform.Platform();
|
|
}
|
|
|
|
- if (!(flags & ProcessInitializationFlags::kNoInitializeCppgc)) {
|
|
+ if (!(flags & ProcessInitializationFlags::kNoInitializeCppgc) && !cppgc::IsInitialized()) {
|
|
v8::PageAllocator* allocator = nullptr;
|
|
if (result->platform_ != nullptr) {
|
|
allocator = result->platform_->GetPageAllocator();
|