Visitar URL original
chore: bump node to v24.20.0 (45-x-y) (#53251) · electron/electron@22d6b3a · GitHub
Skip to content

Commit 22d6b3a

Browse files
electron-roller[bot]MarshallOfSound
electron-roller[bot]
and
MarshallOfSound
authored
chore: bump node to v24.20.0 (45-x-y) (#53251)
* chore: bump node in DEPS to v24.20.0 * chore: remove upstreamed patches Both patches are backports that landed in Node.js v24.20.0. Ref: nodejs/node#61999 Ref: nodejs/node#64271 * fix(patch): implement package maps in the ESM resolver Upstream rewrote packageResolve() to branch on hasPackageMap() and added join to the path imports, which shifted the context around the electron: specifier shortcut and the legacyMainResolve imports. Ref: nodejs/node#62239 * chore: update patches (trivial only) * fix(patch): split OpenSSL 3, BoringSSL, and legacy backends Upstream added an ASN.1 helper, ReadASN1Element, whose only callers live under NCRYPTO_USE_OPENSSL3_PROVIDER. With BoringSSL that macro is 0, so the helper is unused and fails -Werror=unused-function. Guard the definition with the same macro as its callers. Ref: nodejs/node#64211 * chore: update filenames.auto.gni Node.js v24.20.0 replaced src/quic/logstream.h with src/quic/session_manager.h. * fix(patch): update sqlite to 3.53.4 The new sqlite amalgamation compares 'unsigned int cnt' against 'int lenDelta' in rbuDeltaApply, which fails -Werror=sign-compare. Extend the existing sqlite sign-compare patch to cast that operand too. Ref: nodejs/node#64745 * fix(patch): do not pass removed JSPI V8 flag Node.js v24.20.0 backported JSPI enablement, which unconditionally passes --experimental-wasm-jspi to V8. Chromium's V8 removed that flag (JSPI is always on), so node_mksnapshot aborts with "bad option". Drop the argument in a new patch, matching main. Ref: nodejs/node#59941 Ref: https://chromium-review.googlesource.com/c/v8/v8/+/6937664 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Sam Attard <sattard@anthropic.com>
1 parent 77a55bf commit 22d6b3a

51 files changed

Lines changed: 276 additions & 364 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vars = {
44
'chromium_version':
55
'154.0.8036.0',
66
'node_version':
7-
'v24.19.0',
7+
'v24.20.0',
88
'nan_version':
99
'675cefebca42410733da8a454c8d9391fcebfbc2',
1010
'squirrel.mac_version':

‎filenames.auto.gni‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,10 +392,10 @@ auto_filenames = {
392392
"../third_party/electron_node/src/quic/endpoint.h",
393393
"../third_party/electron_node/src/quic/guard.h",
394394
"../third_party/electron_node/src/quic/http3.h",
395-
"../third_party/electron_node/src/quic/logstream.h",
396395
"../third_party/electron_node/src/quic/packet.h",
397396
"../third_party/electron_node/src/quic/preferredaddress.h",
398397
"../third_party/electron_node/src/quic/session.h",
398+
"../third_party/electron_node/src/quic/session_manager.h",
399399
"../third_party/electron_node/src/quic/sessionticket.h",
400400
"../third_party/electron_node/src/quic/streams.h",
401401
"../third_party/electron_node/src/quic/tlscontext.h",

‎patches/node/.patches‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,8 @@ src_stop_using_deprecated_get_setprototypev2_and_holderv2.patch
5353
v8_prepare_for_migrating_v8_microtaskqueue_to_cppgc.patch
5454
v8_propagate_v8_cppgc_microtask_queue_flag_to_common_gypi.patch
5555
fix_don_t_arm_delayed_worker_task_timers_after_the_platform_s.patch
56-
src_fix_libuv_assertion_on_windows.patch
5756
inspector_avoid_calling_into_js_from_v8_interrupts.patch
5857
inspector_defer_remaining_js_execution_from_v8_interrupts.patch
59-
test_remove_impact_of_tier-up_changes_in_worker_stack_size_test.patch
6058
src_migrate_to_setter_definer_interceptor_callbacks_returning.patch
6159
src_adapt_async_context_frame_to_cped_api_returning_v8_data.patch
6260
build_perfetto-sdk.patch
@@ -68,3 +66,4 @@ src_test_disable_trace_events_tests_when_perfetto_is_enabled.patch
6866
test_account_for_libc_rm_error_on_electron_linux.patch
6967
fix_use_embedder_perfetto_client_when_available.patch
7068
src_fix_external_reference_registration_for_new_cfunction_lifetime.patch
69+
fix_do_not_pass_removed_jspi_v8_flag.patch

‎patches/node/api_promote_deprecation_of_v8_context_and_v8_object_api_methods.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ index 74bbb9fb83246a90bc425e259150f0868020ac9e..a4b3a1c0907c9d50baf6c8cd473cb4c7
7272

7373
inline Environment* Environment::GetCurrent(
7474
diff --git a/src/env.cc b/src/env.cc
75-
index 9b67143ce4707b175d607237bdea137149a9935a..325fbb0c727bb41cb163ce0384b378aa4c285cd7 100644
75+
index bfa419e0d57a610381cf9de4017e6f173b77c6d7..20e001bb870ceb118a4f95d2e8dbcedd9717365a 100644
7676
--- a/src/env.cc
7777
+++ b/src/env.cc
7878
@@ -665,13 +665,16 @@ void TrackingTraceStateObserver::UpdateTraceCategoryState() {

‎patches/node/api_remove_deprecated_getisolate.patch‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ index cc60ddddb037e0279615bbe24821eb20fd8da677..37d83e41b618a07aca98118260abe961
8585

8686
return handle;
8787
diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc
88-
index 60ec48a68abeac1ef2a5ca7b54be71cfefa7581c..55cdd9acc0dd957de7f1c404d2ee295840506097 100644
88+
index e04a769b67505ee082d98cee8ccbf694e85507a8..b531f3649d44c700af92f454302c11d2d8660f2c 100644
8989
--- a/src/crypto/crypto_context.cc
9090
+++ b/src/crypto/crypto_context.cc
91-
@@ -1107,7 +1107,7 @@ bool ArrayOfStringsToX509s(Local<Context> context,
91+
@@ -1173,7 +1173,7 @@ bool ArrayOfStringsToX509s(Local<Context> context,
9292
Local<Array> cert_array,
9393
std::vector<X509*>* certs) {
9494
ClearErrorOnReturn clear_error_on_return;
@@ -98,10 +98,10 @@ index 60ec48a68abeac1ef2a5ca7b54be71cfefa7581c..55cdd9acc0dd957de7f1c404d2ee2958
9898
uint32_t array_length = cert_array->Length();
9999

100100
diff --git a/src/crypto/crypto_x509.cc b/src/crypto/crypto_x509.cc
101-
index 49a022204773219f97bda25268f7e49c2a297da7..91ae1ec2c550f5ec4398934c6b145617af0a7cdb 100644
101+
index 82da68d8eef06c57aae76f2b54eeb09db5b41ecf..9d3fddd63d1e333674633752b2b5243c8d9954c7 100644
102102
--- a/src/crypto/crypto_x509.cc
103103
+++ b/src/crypto/crypto_x509.cc
104-
@@ -110,7 +110,7 @@ MaybeLocal<Value> ToV8Value(Local<Context> context, BIOPointer&& bio) {
104+
@@ -109,7 +109,7 @@ MaybeLocal<Value> ToV8Value(Local<Context> context, BIOPointer&& bio) {
105105
if (!mem) [[unlikely]]
106106
return {};
107107
Local<Value> ret;
@@ -110,7 +110,7 @@ index 49a022204773219f97bda25268f7e49c2a297da7..91ae1ec2c550f5ec4398934c6b145617
110110
mem->data,
111111
NewStringType::kNormal,
112112
mem->length)
113-
@@ -126,7 +126,7 @@ MaybeLocal<Value> ToV8Value(Local<Context> context, const BIOPointer& bio) {
113+
@@ -125,7 +125,7 @@ MaybeLocal<Value> ToV8Value(Local<Context> context, const BIOPointer& bio) {
114114
if (!mem) [[unlikely]]
115115
return {};
116116
Local<Value> ret;
@@ -133,10 +133,10 @@ index 31277621e92b4d3583a67140f4ab8a74a9c6df3b..caa109871b71926f3355491767b8064b
133133
// Recreate the buffer in the constructor.
134134
InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info);
135135
diff --git a/src/env.cc b/src/env.cc
136-
index dace5b3ca4c1c386c5d529b56f1d56da83290297..9b67143ce4707b175d607237bdea137149a9935a 100644
136+
index 52b971ecd8d5fed8a4348aebbec2b0138e906355..bfa419e0d57a610381cf9de4017e6f173b77c6d7 100644
137137
--- a/src/env.cc
138138
+++ b/src/env.cc
139-
@@ -1760,10 +1760,10 @@ void AsyncHooks::Deserialize(Local<Context> context) {
139+
@@ -1763,10 +1763,10 @@ void AsyncHooks::Deserialize(Local<Context> context) {
140140
context->GetDataFromSnapshotOnce<Array>(
141141
info_->js_execution_async_resources).ToLocalChecked();
142142
} else {
@@ -149,7 +149,7 @@ index dace5b3ca4c1c386c5d529b56f1d56da83290297..9b67143ce4707b175d607237bdea1371
149149

150150
// The native_execution_async_resources_ field requires v8::Local<> instances
151151
// for async calls whose resources were on the stack as JS objects when they
152-
@@ -1803,7 +1803,7 @@ AsyncHooks::SerializeInfo AsyncHooks::Serialize(Local<Context> context,
152+
@@ -1806,7 +1806,7 @@ AsyncHooks::SerializeInfo AsyncHooks::Serialize(Local<Context> context,
153153
info.async_id_fields = async_id_fields_.Serialize(context, creator);
154154
if (!js_execution_async_resources_.IsEmpty()) {
155155
info.js_execution_async_resources = creator->AddData(
@@ -225,7 +225,7 @@ index 27aeac589b19cd681923fb848ce5f36c66fc05e2..5f2900869763f40cac54e3cb3fe2e24e
225225
module_api_version(module_api_version) {
226226
napi_clear_last_error(this);
227227
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
228-
index 52483740bb377a2bc2a16af701615d9a4e448eae..84d17a46efe146c1794a43963c41a4461eacfca2 100644
228+
index fbcf8f0f99ccaac583040e1ecebcbf65bd03cfa6..6934e3ca3751091e6ebc7802dabf8b50fd9f6355 100644
229229
--- a/src/module_wrap.cc
230230
+++ b/src/module_wrap.cc
231231
@@ -99,7 +99,7 @@ ModuleCacheKey ModuleCacheKey::From(Local<Context> context,
@@ -237,7 +237,7 @@ index 52483740bb377a2bc2a16af701615d9a4e448eae..84d17a46efe146c1794a43963c41a446
237237
std::size_t h1 = specifier->GetIdentityHash();
238238
size_t num_attributes = import_attributes->Length() / elements_per_attribute;
239239
ImportAttributeVector attributes;
240-
@@ -1022,7 +1022,7 @@ MaybeLocal<Module> ModuleWrap::ResolveModuleCallback(
240+
@@ -1008,7 +1008,7 @@ MaybeLocal<Module> ModuleWrap::ResolveModuleCallback(
241241
return {};
242242
}
243243
DCHECK_NOT_NULL(resolved_module);
@@ -246,7 +246,7 @@ index 52483740bb377a2bc2a16af701615d9a4e448eae..84d17a46efe146c1794a43963c41a446
246246
}
247247

248248
// static
249-
@@ -1043,7 +1043,7 @@ MaybeLocal<Object> ModuleWrap::ResolveSourceCallback(
249+
@@ -1029,7 +1029,7 @@ MaybeLocal<Object> ModuleWrap::ResolveSourceCallback(
250250
->GetInternalField(ModuleWrap::kModuleSourceObjectSlot)
251251
.As<Value>();
252252
if (module_source_object->IsUndefined()) {
@@ -255,7 +255,7 @@ index 52483740bb377a2bc2a16af701615d9a4e448eae..84d17a46efe146c1794a43963c41a446
255255
resolved_module->url_);
256256
return {};
257257
}
258-
@@ -1057,7 +1057,7 @@ Maybe<ModuleWrap*> ModuleWrap::ResolveModule(
258+
@@ -1043,7 +1043,7 @@ Maybe<ModuleWrap*> ModuleWrap::ResolveModule(
259259
Local<String> specifier,
260260
Local<FixedArray> import_attributes,
261261
Local<Module> referrer) {
@@ -264,7 +264,7 @@ index 52483740bb377a2bc2a16af701615d9a4e448eae..84d17a46efe146c1794a43963c41a446
264264
Environment* env = Environment::GetCurrent(context);
265265
if (env == nullptr) {
266266
THROW_ERR_EXECUTION_ENVIRONMENT_NOT_AVAILABLE(isolate);
267-
@@ -1106,7 +1106,7 @@ MaybeLocal<Promise> ImportModuleDynamicallyWithPhase(
267+
@@ -1092,7 +1092,7 @@ MaybeLocal<Promise> ImportModuleDynamicallyWithPhase(
268268
Local<String> specifier,
269269
ModuleImportPhase phase,
270270
Local<FixedArray> import_attributes) {
@@ -273,7 +273,7 @@ index 52483740bb377a2bc2a16af701615d9a4e448eae..84d17a46efe146c1794a43963c41a446
273273
Environment* env = Environment::GetCurrent(context);
274274
if (env == nullptr) {
275275
THROW_ERR_EXECUTION_ENVIRONMENT_NOT_AVAILABLE(isolate);
276-
@@ -1348,7 +1348,7 @@ MaybeLocal<Module> LinkRequireFacadeWithOriginal(
276+
@@ -1334,7 +1334,7 @@ MaybeLocal<Module> LinkRequireFacadeWithOriginal(
277277
Local<FixedArray> import_attributes,
278278
Local<Module> referrer) {
279279
Environment* env = Environment::GetCurrent(context);
@@ -305,10 +305,10 @@ index 9d42692040941f7ed2813a9fb329722f70939638..9ad4985f284255cf2d1fbab411dd5e0e
305305
v8::Local<v8::String> constant_name = v8::String::NewFromUtf8Literal( \
306306
isolate, #constant, v8::NewStringType::kInternalized); \
307307
diff --git a/src/node_blob.cc b/src/node_blob.cc
308-
index 322c0a603f12c8316a9b1abff4e3e0ef1b9761e0..00deb82f46c3224dc750ce2863a019086b7918e7 100644
308+
index d05a693120f2643dc01395493d51db3d3f95f9b7..57d35358fbfd71bc0ef01f8c83f5f00f0b02b8cf 100644
309309
--- a/src/node_blob.cc
310310
+++ b/src/node_blob.cc
311-
@@ -576,7 +576,7 @@ void BlobBindingData::Deserialize(Local<Context> context,
311+
@@ -580,7 +580,7 @@ void BlobBindingData::Deserialize(Local<Context> context,
312312
int index,
313313
InternalFieldInfoBase* info) {
314314
DCHECK_IS_SNAPSHOT_SLOT(index);
@@ -318,10 +318,10 @@ index 322c0a603f12c8316a9b1abff4e3e0ef1b9761e0..00deb82f46c3224dc750ce2863a01908
318318
BlobBindingData* binding = realm->AddBindingData<BlobBindingData>(holder);
319319
CHECK_NOT_NULL(binding);
320320
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
321-
index 4d16947fa90066393672f511234702e5877c8ea7..180fefa046d9a070fc31fbb0a3555817823332a2 100644
321+
index ab9f14174e7a16b2da17a9d5a00aa82318aac9b6..a4c62510ad9f8c2c77986ead1e17afd319adc496 100644
322322
--- a/src/node_builtins.cc
323323
+++ b/src/node_builtins.cc
324-
@@ -277,7 +277,7 @@ MaybeLocal<Data> BuiltinLoader::LookupAndCompile(
324+
@@ -279,7 +279,7 @@ MaybeLocal<Data> BuiltinLoader::LookupAndCompile(
325325
Local<Context> context,
326326
const BuiltinSource* builtin_source,
327327
Realm* optional_realm) {
@@ -330,7 +330,7 @@ index 4d16947fa90066393672f511234702e5877c8ea7..180fefa046d9a070fc31fbb0a3555817
330330
EscapableHandleScope scope(isolate);
331331

332332
BuiltinCodeCacheData cached_data{};
333-
@@ -445,7 +445,7 @@ void BuiltinLoader::SaveCodeCache(const std::string& id, Local<Data> data) {
333+
@@ -447,7 +447,7 @@ void BuiltinLoader::SaveCodeCache(const std::string& id, Local<Data> data) {
334334

335335
MaybeLocal<Function> BuiltinLoader::LookupAndCompileFunction(
336336
Local<Context> context, const char* id, Realm* optional_realm) {
@@ -339,7 +339,7 @@ index 4d16947fa90066393672f511234702e5877c8ea7..180fefa046d9a070fc31fbb0a3555817
339339
LocalVector<String> parameters(isolate);
340340

341341
Local<Data> data;
342-
@@ -486,7 +486,7 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompileFunction(
342+
@@ -488,7 +488,7 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompileFunction(
343343
MaybeLocal<Value> BuiltinLoader::CompileAndCall(Local<Context> context,
344344
const char* id,
345345
Realm* realm) {
@@ -348,7 +348,7 @@ index 4d16947fa90066393672f511234702e5877c8ea7..180fefa046d9a070fc31fbb0a3555817
348348
const BuiltinSource* builtin_source = LoadBuiltinSource(isolate, id);
349349
if (builtin_source == nullptr) {
350350
THROW_ERR_MODULE_NOT_FOUND(isolate, "Cannot find module %s", id);
351-
@@ -558,7 +558,7 @@ MaybeLocal<Value> BuiltinLoader::CompileAndCallWith(Local<Context> context,
351+
@@ -560,7 +560,7 @@ MaybeLocal<Value> BuiltinLoader::CompileAndCallWith(Local<Context> context,
352352
if (!maybe_fn.ToLocal(&fn)) {
353353
return MaybeLocal<Value>();
354354
}
@@ -357,7 +357,7 @@ index 4d16947fa90066393672f511234702e5877c8ea7..180fefa046d9a070fc31fbb0a3555817
357357
return fn->Call(context, undefined, argc, argv);
358358
}
359359

360-
@@ -582,14 +582,14 @@ bool BuiltinLoader::CompileAllBuiltinsAndCopyCodeCache(
360+
@@ -584,14 +584,14 @@ bool BuiltinLoader::CompileAllBuiltinsAndCopyCodeCache(
361361
to_eager_compile_.emplace(id);
362362
}
363363

@@ -375,10 +375,10 @@ index 4d16947fa90066393672f511234702e5877c8ea7..180fefa046d9a070fc31fbb0a3555817
375375
// This is used by the snapshot builder, so save the code cache
376376
// unconditionally.
377377
diff --git a/src/node_constants.cc b/src/node_constants.cc
378-
index fea0426496978c0003fe1481afcf93fc9c23edca..c9588880d05435ab9f4e23fcff74c93309664270 100644
378+
index 4a54e6b3e649b2d35962bc8589eefd96dcf4f942..82999148a9ee740deb13ed4cc7968f2300299b1a 100644
379379
--- a/src/node_constants.cc
380380
+++ b/src/node_constants.cc
381-
@@ -1265,7 +1265,7 @@ void CreatePerContextProperties(Local<Object> target,
381+
@@ -1315,7 +1315,7 @@ void CreatePerContextProperties(Local<Object> target,
382382
Local<Value> unused,
383383
Local<Context> context,
384384
void* priv) {
@@ -463,10 +463,10 @@ index dc55d1c0d9fcbbbb99d6f459280e09e2d37cb04b..a222e7078b3a92ff21bd009ab00361fc
463463
READONLY_PROPERTY(target, "exitCodes", exit_codes);
464464

465465
diff --git a/src/node_file.cc b/src/node_file.cc
466-
index d828e7e78f9b41e053c306b01a71ad3ad847aaf6..c24c952538cfd28d46209299550bae0bfa7317dc 100644
466+
index 5be1b553e29dbcc78c4bee1b778587ede6bc60f8..dec05abe58a969334ee4f13b4ed7b7dc0fd0b6ad 100644
467467
--- a/src/node_file.cc
468468
+++ b/src/node_file.cc
469-
@@ -3899,7 +3899,7 @@ void BindingData::Deserialize(Local<Context> context,
469+
@@ -4128,7 +4128,7 @@ void BindingData::Deserialize(Local<Context> context,
470470
int index,
471471
InternalFieldInfoBase* info) {
472472
DCHECK_IS_SNAPSHOT_SLOT(index);
@@ -590,10 +590,10 @@ index 41b0773f4c37a016cfa55aff6bb03baf50905b32..c3e995adf437413fe956e45c2ccc704d
590590
// Recreate the buffer in the constructor.
591591
InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info);
592592
diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc
593-
index d506d33ace4f9dd19211ca31a439661c1bdccb56..fb765922dc372953efe4aea9ac92aaec17540ea9 100644
593+
index cf9db75a84f9d58f10d2b35e8ac6c8bb9bf1e5ba..784621a14fae6d20bd6c8b1584df8577180888a2 100644
594594
--- a/src/node_sqlite.cc
595595
+++ b/src/node_sqlite.cc
596-
@@ -2612,7 +2612,7 @@ bool StatementSync::BindParams(const FunctionCallbackInfo<Value>& args) {
596+
@@ -2639,7 +2639,7 @@ bool StatementSync::BindParams(const FunctionCallbackInfo<Value>& args) {
597597

598598
if (args[0]->IsObject() && !args[0]->IsArrayBufferView()) {
599599
Local<Object> obj = args[0].As<Object>();
@@ -629,10 +629,10 @@ index 5f5241f6c6741218024452202c4a17c7d0239e6b..75aaf468f508f2888daea2f77e98c728
629629
BindingData* binding = realm->AddBindingData<BindingData>(holder);
630630
CHECK_NOT_NULL(binding);
631631
diff --git a/src/node_v8.cc b/src/node_v8.cc
632-
index fbbf75acf50edceaf0cfb57d9c76d926b834ae30..1b86a8a08ba178ebd2f25d44f427c59676f05489 100644
632+
index 06164d7792f8a7450bf3283d57aa344937546ece..7e7fd72645e8f534623d3dd0cb832b933dce2b45 100644
633633
--- a/src/node_v8.cc
634634
+++ b/src/node_v8.cc
635-
@@ -164,7 +164,7 @@ void BindingData::Deserialize(Local<Context> context,
635+
@@ -165,7 +165,7 @@ void BindingData::Deserialize(Local<Context> context,
636636
int index,
637637
InternalFieldInfoBase* info) {
638638
DCHECK_IS_SNAPSHOT_SLOT(index);

‎patches/node/build_add_gn_build_files.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ was missing gypi_values.node_pdl_files from its inputs, causing Ninja to skip
1515
regeneration when PDL domain files changed. Should be upstreamed.
1616

1717
diff --git a/configure.py b/configure.py
18-
index a9910d038f01cbc450ce57d2f08f353329d8846b..960c6023950bfd507e3d4553139a069086e3d14c 100755
18+
index 7fd64a9620e3365c9bb8cb2aae19b7b376bf0d52..979f50cd92898500108daa343cbefa00c590c776 100755
1919
--- a/configure.py
2020
+++ b/configure.py
21-
@@ -1958,7 +1958,7 @@ def configure_v8(o, configs):
21+
@@ -1987,7 +1987,7 @@ def configure_v8(o, configs):
2222
# Until we manage to get rid of all those, v8_enable_sandbox cannot be used.
2323
# Note that enabling pointer compression without enabling sandbox is unsupported by V8,
2424
# so this can be broken at any time.
@@ -72,10 +72,10 @@ index 41f200189a34e150e4c8f25da2a72c2108259720..156fee33b3813fe4d94a1c9585f217a9
7272

7373
assert(!node_enable_inspector || node_use_openssl,
7474
diff --git a/src/node_builtins.cc b/src/node_builtins.cc
75-
index 70c628294c98d79d2eb1a5e519f50113f42e4d8e..edcf2d8424f9b60d68ddd95b16da488feec2c41b 100644
75+
index bf1276f82412b7321732995cfc2f93d9cce961a2..cfd8c8c9c7d8911be7b3a66f4695e54f1022a678 100644
7676
--- a/src/node_builtins.cc
7777
+++ b/src/node_builtins.cc
78-
@@ -458,6 +458,30 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompileFunction(
78+
@@ -460,6 +460,30 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompileFunction(
7979
return value.As<Function>();
8080
}
8181

@@ -106,7 +106,7 @@ index 70c628294c98d79d2eb1a5e519f50113f42e4d8e..edcf2d8424f9b60d68ddd95b16da488f
106106
MaybeLocal<Value> BuiltinLoader::CompileAndCall(Local<Context> context,
107107
const char* id,
108108
Realm* realm) {
109-
@@ -744,7 +768,7 @@ MaybeLocal<Module> BuiltinLoader::LoadBuiltinSourceTextModule(Realm* realm,
109+
@@ -746,7 +770,7 @@ MaybeLocal<Module> BuiltinLoader::LoadBuiltinSourceTextModule(Realm* realm,
110110
// Pre-fetch all dependencies.
111111
if (requests->Length() > 0) {
112112
for (int i = 0; i < requests->Length(); i++) {
@@ -115,7 +115,7 @@ index 70c628294c98d79d2eb1a5e519f50113f42e4d8e..edcf2d8424f9b60d68ddd95b16da488f
115115
std::string specifier =
116116
Utf8Value(isolate, req->GetSpecifier()).ToString();
117117
std::string resolved_id = ResolveRequestForBuiltin(specifier);
118-
@@ -903,6 +927,7 @@ void BuiltinLoader::RegisterExternalReferences(
118+
@@ -905,6 +929,7 @@ void BuiltinLoader::RegisterExternalReferences(
119119
registry->Register(ImportBuiltinSourceTextModule);
120120

121121
RegisterExternalReferencesForInternalizedBuiltinCode(registry);
@@ -124,7 +124,7 @@ index 70c628294c98d79d2eb1a5e519f50113f42e4d8e..edcf2d8424f9b60d68ddd95b16da488f
124124

125125
} // namespace builtins
126126
diff --git a/src/node_builtins.h b/src/node_builtins.h
127-
index e4af1f42f4442b4c1ec94cf25d8d811f0e82d89e..490f429986e43653e0dd2048d9e3bd2e99ae44b2 100644
127+
index b51b85ff6f2389d431890da3a39a406aeb8552e3..8cf93ffc86d5f186bf630aa95a304d5e457d9e97 100644
128128
--- a/src/node_builtins.h
129129
+++ b/src/node_builtins.h
130130
@@ -82,6 +82,8 @@ using BuiltinCodeCacheMap =

0 commit comments

Comments
 (0)