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 2ff08a9cb6124316049a91bda70cf6985045286a..5de93329cbd40a2ca314d602b123092ed15741c5 100644
|
||
|
|
--- a/src/node.cc
|
||
|
|
+++ b/src/node.cc
|
||
|
|
@@ -1173,7 +1173,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();
|