Skip to content

Commit 417f147

Browse files
feat: add v26.5.0 patch (#197)
## Node.js Patch Update to v26.5.0 This PR updates the Node.js patch from v26.4.0 to v26.5.0. ### Resolution 🤖 Conflicts were resolved with `actions/ai-inference@v2` (GitHub Models). Parsed 1 search/replace block(s) from AI response ✅ src/node_contextify.cc: applied resolution (1/1) CONFLICTS_RESOLVED=1 TOTAL_CONFLICTS=1 HAS_UNRESOLVED=False Resolution summary: 1/1 conflicts resolved ℹ️ The patch was updated to match the v26.5.0 source tree. ✅ Generated patch re-applies to a pristine v26.5.0 tree (build still validates semantics). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent e5e396c commit 417f147

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ index 6732808e85..ebb7938f64 100644
364364
}
365365
}
366366
diff --git node/lib/child_process.js node/lib/child_process.js
367-
index 824af65556..8393ee812f 100644
367+
index 0e3e04af0d..6efe7cfe78 100644
368368
--- node/lib/child_process.js
369369
+++ node/lib/child_process.js
370370
@@ -171,7 +171,7 @@ function fork(modulePath, args = [], options) {
@@ -432,10 +432,10 @@ index 0000000000..a697294fdf
432432
+ }());
433433
+}());
434434
diff --git node/lib/internal/modules/cjs/loader.js node/lib/internal/modules/cjs/loader.js
435-
index a97a5f27a2..cf6c9d1a29 100644
435+
index e1f8a0eed3..9f6dae2d3b 100644
436436
--- node/lib/internal/modules/cjs/loader.js
437437
+++ node/lib/internal/modules/cjs/loader.js
438-
@@ -272,12 +272,15 @@ function stat(filename) {
438+
@@ -273,12 +273,15 @@ function stat(filename) {
439439
// Guard against internal bugs where a non-string filename is passed in by mistake.
440440
assert(typeof filename === 'string');
441441

@@ -589,7 +589,7 @@ index 4ba019ddca..b30d716a41 100644
589589
}
590590

591591
diff --git node/src/node_contextify.cc node/src/node_contextify.cc
592-
index 40ed019a73..3b74ea28d5 100644
592+
index dcfaf02c7e..5d1f63a4a8 100644
593593
--- node/src/node_contextify.cc
594594
+++ node/src/node_contextify.cc
595595
@@ -88,6 +88,7 @@ using v8::String;
@@ -598,9 +598,9 @@ index 40ed019a73..3b74ea28d5 100644
598598
using v8::Value;
599599
+using v8::V8;
600600

601-
// The vm module executes code in a sandboxed environment with a different
602-
// global object than the rest of the code. This is achieved by applying
603-
@@ -981,13 +982,13 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
601+
// This is a helper function mediates deleted v8::PropertyDescriptor copy/move.
602+
// The `Fn` receives a mutable reference of a stack allocated
603+
@@ -983,13 +984,13 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
604604
Local<ArrayBufferView> cached_data_buf;
605605
bool produce_cached_data = false;
606606
Local<Context> parsing_context = context;
@@ -617,7 +617,7 @@ index 40ed019a73..3b74ea28d5 100644
617617
CHECK(args[2]->IsNumber());
618618
line_offset = args[2].As<Int32>()->Value();
619619
CHECK(args[3]->IsNumber());
620-
@@ -1008,6 +1009,11 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
620+
@@ -1010,6 +1011,11 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
621621
}
622622
CHECK(args[7]->IsSymbol());
623623
id_symbol = args[7].As<Symbol>();
@@ -629,7 +629,7 @@ index 40ed019a73..3b74ea28d5 100644
629629
}
630630

631631
ContextifyScript* contextify_script = New(env, args.This());
632-
@@ -1054,6 +1060,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
632+
@@ -1056,6 +1062,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
633633
ShouldNotAbortOnUncaughtScope no_abort_scope(env);
634634
Context::Scope scope(parsing_context);
635635

@@ -640,7 +640,7 @@ index 40ed019a73..3b74ea28d5 100644
640640
MaybeLocal<UnboundScript> maybe_v8_script =
641641
ScriptCompiler::CompileUnboundScript(isolate, &source, compile_options);
642642

643-
@@ -1068,6 +1078,12 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
643+
@@ -1070,6 +1080,12 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
644644
return;
645645
}
646646

@@ -653,7 +653,7 @@ index 40ed019a73..3b74ea28d5 100644
653653
contextify_script->set_unbound_script(v8_script);
654654

655655
std::unique_ptr<ScriptCompiler::CachedData> new_cached_data;
656-
@@ -1080,7 +1096,7 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
656+
@@ -1082,7 +1098,7 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
657657
if (contextify_script->object()
658658
->SetPrivate(context, env->host_defined_option_symbol(), id_symbol)
659659
.IsNothing()) {
@@ -662,7 +662,7 @@ index 40ed019a73..3b74ea28d5 100644
662662
}
663663
if (StoreCodeCacheResult(env,
664664
self,
665-
@@ -1091,6 +1107,9 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
665+
@@ -1093,6 +1109,9 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
666666
.IsNothing()) {
667667
return;
668668
}
@@ -783,7 +783,7 @@ index 3295121b87..bfe838b8c1 100644
783783
+ return adjacent(c, nargv);
784784
+}
785785
diff --git node/src/node_options.cc node/src/node_options.cc
786-
index 769fabbfe8..8007dd3cdd 100644
786+
index b0ddfb9eb9..9c83f88bf8 100644
787787
--- node/src/node_options.cc
788788
+++ node/src/node_options.cc
789789
@@ -466,6 +466,7 @@ void Parse(

patches/patches.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"v26.4.0": ["node.v26.4.0.cpp.patch"],
2+
"v26.5.0": ["node.v26.5.0.cpp.patch"],
33
"v24.18.0": ["node.v24.18.0.cpp.patch"],
44
"v22.23.1": ["node.v22.23.1.cpp.patch"],
55
"v20.20.2": ["node.v20.20.2.cpp.patch"],

0 commit comments

Comments
 (0)