diff --git a/patches/node/api_remove_deprecated_getisolate.patch b/patches/node/api_remove_deprecated_getisolate.patch index 150c9f1fdd..2dbd536899 100644 --- a/patches/node/api_remove_deprecated_getisolate.patch +++ b/patches/node/api_remove_deprecated_getisolate.patch @@ -508,10 +508,10 @@ index 492d5f455f45a5c8a957ecdabed38709a633f640..48f9917113555c7ed87e37750c45d152 Local keys; if (!entries->GetOwnPropertyNames(context).ToLocal(&keys)) diff --git a/src/node_errors.cc b/src/node_errors.cc -index 4386a1bc5678e351ce084cd2c47202561619b164..8d51201ad24999ed8f54e16c7878432d41841cf2 100644 +index 36a21b9523351fe2f225ffe7fca184d737640b62..c6e9e2c00064348c435ae10871a4013cb49376e6 100644 --- a/src/node_errors.cc +++ b/src/node_errors.cc -@@ -633,7 +633,7 @@ v8::ModifyCodeGenerationFromStringsResult ModifyCodeGenerationFromStrings( +@@ -631,7 +631,7 @@ v8::ModifyCodeGenerationFromStringsResult ModifyCodeGenerationFromStrings( v8::Local context, v8::Local source, bool is_code_like) { @@ -520,7 +520,7 @@ index 4386a1bc5678e351ce084cd2c47202561619b164..8d51201ad24999ed8f54e16c7878432d if (context->GetNumberOfEmbedderDataFields() <= ContextEmbedderIndex::kAllowCodeGenerationFromStrings) { -@@ -1000,7 +1000,7 @@ const char* errno_string(int errorno) { +@@ -1037,7 +1037,7 @@ const char* errno_string(int errorno) { } void PerIsolateMessageListener(Local message, Local error) { @@ -529,7 +529,7 @@ index 4386a1bc5678e351ce084cd2c47202561619b164..8d51201ad24999ed8f54e16c7878432d switch (message->ErrorLevel()) { case Isolate::MessageErrorLevel::kMessageWarning: { Environment* env = Environment::GetCurrent(isolate); -@@ -1161,7 +1161,7 @@ void Initialize(Local target, +@@ -1198,7 +1198,7 @@ void Initialize(Local target, SetMethod( context, target, "getErrorSourcePositions", GetErrorSourcePositions); @@ -640,7 +640,7 @@ index 66a8ee48fc68b22eaf6c9d9209cc5cb2439e55ff..b31e244f8af7d37c35319853a478776c env->AssignToContext(context, this, ContextInfo("")); } diff --git a/src/node_report.cc b/src/node_report.cc -index 8ff711f12e19f73e50daac2b9c0fd26773d32758..6966710e8f0be542364850776ddf76f9223a02e7 100644 +index e1f4e30417d17f85d2294f3a01e6d90f0a443948..12a59307b452b0d67ebe909cae0458b8a0ca085b 100644 --- a/src/node_report.cc +++ b/src/node_report.cc @@ -399,7 +399,7 @@ static void PrintJavaScriptErrorProperties(JSONWriter* writer, diff --git a/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch b/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch index a5212c7fb5..46a2975a89 100644 --- a/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch +++ b/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch @@ -8,10 +8,10 @@ they use themselves as the entry point. We should try to upstream some form of this. diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js -index d12d21905c4823f45cffeea4423e99e81b1008f5..4987cd3f6c9eefb440bca3f58113df6cd5b410ac 100644 +index 15443a710ccf53fae333da3b1fbb52a970c658d5..464b34829c1a566836bfca6bbc2b87fcf5e50016 100644 --- a/lib/internal/process/pre_execution.js +++ b/lib/internal/process/pre_execution.js -@@ -267,12 +267,14 @@ function patchProcessObject(expandArgv1) { +@@ -265,12 +265,14 @@ function patchProcessObject(expandArgv1) { // the entry point. if (expandArgv1 && process.argv[1] && process.argv[1][0] !== '-') { // Expand process.argv[1] into a full path. diff --git a/patches/node/fix_remove_deprecated_errno_constants.patch b/patches/node/fix_remove_deprecated_errno_constants.patch index ffd3ae5ee6..7d01122c8b 100644 --- a/patches/node/fix_remove_deprecated_errno_constants.patch +++ b/patches/node/fix_remove_deprecated_errno_constants.patch @@ -86,10 +86,10 @@ index 0ca643aa74d13f278685d2330b791182b55c15b4..cbcecfba33070b820aca0e2814982160 NODE_DEFINE_CONSTANT(target, ETIMEDOUT); #endif diff --git a/src/node_errors.cc b/src/node_errors.cc -index ae8553ee2022d60fea4572976b14ba9cd253aa45..4386a1bc5678e351ce084cd2c47202561619b164 100644 +index 238942d45a136facec55ca5a2534e2dc407137e9..36a21b9523351fe2f225ffe7fca184d737640b62 100644 --- a/src/node_errors.cc +++ b/src/node_errors.cc -@@ -862,10 +862,6 @@ const char* errno_string(int errorno) { +@@ -899,10 +899,6 @@ const char* errno_string(int errorno) { ERRNO_CASE(ENOBUFS); #endif @@ -100,7 +100,7 @@ index ae8553ee2022d60fea4572976b14ba9cd253aa45..4386a1bc5678e351ce084cd2c4720256 #ifdef ENODEV ERRNO_CASE(ENODEV); #endif -@@ -904,14 +900,6 @@ const char* errno_string(int errorno) { +@@ -941,14 +937,6 @@ const char* errno_string(int errorno) { ERRNO_CASE(ENOSPC); #endif @@ -115,7 +115,7 @@ index ae8553ee2022d60fea4572976b14ba9cd253aa45..4386a1bc5678e351ce084cd2c4720256 #ifdef ENOSYS ERRNO_CASE(ENOSYS); #endif -@@ -994,10 +982,6 @@ const char* errno_string(int errorno) { +@@ -1031,10 +1019,6 @@ const char* errno_string(int errorno) { ERRNO_CASE(ESTALE); #endif diff --git a/patches/node/fix_remove_fastapitypedarray_usage.patch b/patches/node/fix_remove_fastapitypedarray_usage.patch index 8ee0191c2a..bd2cb88ab9 100644 --- a/patches/node/fix_remove_fastapitypedarray_usage.patch +++ b/patches/node/fix_remove_fastapitypedarray_usage.patch @@ -48,7 +48,7 @@ index fe669d40c31a29334b047b9cfee3067f64ef0a7b..9e5de7bbe574add017cd12ee091304d0 static CFunction fast_timing_safe_equal(CFunction::Make(FastTimingSafeEqual)); diff --git a/src/node_buffer.cc b/src/node_buffer.cc -index e39852c8e0392e0a9ae5d4ea58be115416e19233..c94b14741c827a81d69a6f036426a344e563ad72 100644 +index 357dc5f6d1c1c2d3756a94c1326b0502403e1eaf..f02325feea8bbae038c76254a071c77817ca7796 100644 --- a/src/node_buffer.cc +++ b/src/node_buffer.cc @@ -44,6 +44,14 @@ @@ -74,7 +74,7 @@ index e39852c8e0392e0a9ae5d4ea58be115416e19233..c94b14741c827a81d69a6f036426a344 using v8::FunctionCallbackInfo; using v8::Global; using v8::HandleScope; -@@ -584,19 +591,24 @@ void SlowCopy(const FunctionCallbackInfo& args) { +@@ -583,19 +590,24 @@ void SlowCopy(const FunctionCallbackInfo& args) { // Assume caller has properly validated args. uint32_t FastCopy(Local receiver, @@ -107,7 +107,7 @@ index e39852c8e0392e0a9ae5d4ea58be115416e19233..c94b14741c827a81d69a6f036426a344 return to_copy; } -@@ -865,19 +877,17 @@ void Compare(const FunctionCallbackInfo &args) { +@@ -864,19 +876,17 @@ void Compare(const FunctionCallbackInfo &args) { } int32_t FastCompare(v8::Local, @@ -135,7 +135,7 @@ index e39852c8e0392e0a9ae5d4ea58be115416e19233..c94b14741c827a81d69a6f036426a344 } static v8::CFunction fast_compare(v8::CFunction::Make(FastCompare)); -@@ -1149,14 +1159,13 @@ void SlowIndexOfNumber(const FunctionCallbackInfo& args) { +@@ -1148,14 +1158,13 @@ void SlowIndexOfNumber(const FunctionCallbackInfo& args) { } int32_t FastIndexOfNumber(v8::Local, @@ -153,7 +153,7 @@ index e39852c8e0392e0a9ae5d4ea58be115416e19233..c94b14741c827a81d69a6f036426a344 } static v8::CFunction fast_index_of_number( -@@ -1496,21 +1505,31 @@ void SlowWriteString(const FunctionCallbackInfo& args) { +@@ -1510,21 +1519,31 @@ void SlowWriteString(const FunctionCallbackInfo& args) { template uint32_t FastWriteString(Local receiver, diff --git a/patches/node/src_switch_from_get_setprototype_to_get_setprototypev2.patch b/patches/node/src_switch_from_get_setprototype_to_get_setprototypev2.patch index 20ea2cfa43..f64a58c150 100644 --- a/patches/node/src_switch_from_get_setprototype_to_get_setprototypev2.patch +++ b/patches/node/src_switch_from_get_setprototype_to_get_setprototypev2.patch @@ -51,10 +51,10 @@ index 7b2efa49468c0bed2f5935552addd3ab37d0a50b..413db3ed9b88d7b7fb2ac6dd1153dade return GET_RETURN_STATUS(env); } diff --git a/src/node_buffer.cc b/src/node_buffer.cc -index c94b14741c827a81d69a6f036426a344e563ad72..15129e4455fdc8792f21511a04d534ba3a4ebb5f 100644 +index f02325feea8bbae038c76254a071c77817ca7796..7ca0ce803d763213ba3680731ce1bc174736b9a1 100644 --- a/src/node_buffer.cc +++ b/src/node_buffer.cc -@@ -284,8 +284,9 @@ MaybeLocal New(Environment* env, +@@ -283,8 +283,9 @@ MaybeLocal New(Environment* env, size_t length) { CHECK(!env->buffer_prototype_object().IsEmpty()); Local ui = Uint8Array::New(ab, byte_offset, length);