From 2f2e5ee0b30fe14967a872f78b6d4c3b6cb8223f Mon Sep 17 00:00:00 2001
From: G'lek Tarssza <glek@glektarssza.com>
Date: Fri, 1 Dec 2023 19:43:52 -0700
Subject: [PATCH 01/13] Enforce scripts running on bash.

Fixes when users run scripts with other shells.
---
 scripts/test_patch.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/test_patch.sh b/scripts/test_patch.sh
index d21dd75a..77c8f92f 100755
--- a/scripts/test_patch.sh
+++ b/scripts/test_patch.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 node_range=$1
 
 if [ -z "$node_range" ]; then

From 411fe6125532ff8e9d80fc7f3ebf9898527aa7de Mon Sep 17 00:00:00 2001
From: G'lek Tarssza <glek@glektarssza.com>
Date: Fri, 1 Dec 2023 19:45:00 -0700
Subject: [PATCH 02/13] First go at NodeJS v20 support.

---
 patches/node.v20.10.0.cpp.patch | 521 ++++++++++++++++++++++++++++++++
 patches/patches.json            |   1 +
 2 files changed, 522 insertions(+)
 create mode 100644 patches/node.v20.10.0.cpp.patch

diff --git a/patches/node.v20.10.0.cpp.patch b/patches/node.v20.10.0.cpp.patch
new file mode 100644
index 00000000..80315e35
--- /dev/null
+++ b/patches/node.v20.10.0.cpp.patch
@@ -0,0 +1,521 @@
+diff --git a/common.gypi b/common.gypi
+index 4589f51517..97555b4c0b 100644
+--- a/common.gypi
++++ b/common.gypi
+@@ -174,7 +174,7 @@
+               'MSVC_runtimeType': 2   # MultiThreadedDLL (/MD)
+             }],
+             ['llvm_version=="0.0"', {
+-              'lto': ' -flto=4 -fuse-linker-plugin -ffat-lto-objects ', # GCC
++              'lto': ' -flto=4 -ffat-lto-objects ', # GCC
+             }, {
+               'lto': ' -flto ', # Clang
+             }],
+diff --git a/configure.py b/configure.py
+index 62f041ce52..4688ec0fdd 100755
+--- a/configure.py
++++ b/configure.py
+@@ -1270,7 +1270,6 @@ def configure_node(o):
+ 
+   # Enable branch protection for arm64
+   if target_arch == 'arm64':
+-    o['cflags']+=['-msign-return-address=all']
+     o['variables']['arm_fpu'] = options.arm_fpu or 'neon'
+ 
+   if options.node_snapshot_main is not None:
+diff --git a/deps/v8/include/v8-initialization.h b/deps/v8/include/v8-initialization.h
+index d3e35d6ec5..6e9bbe3849 100644
+--- a/deps/v8/include/v8-initialization.h
++++ b/deps/v8/include/v8-initialization.h
+@@ -89,6 +89,10 @@ class V8_EXPORT V8 {
+   static void SetFlagsFromCommandLine(int* argc, char** argv,
+                                       bool remove_flags);
+ 
++  static void EnableCompilationForSourcelessUse();
++  static void DisableCompilationForSourcelessUse();
++  static void FixSourcelessScript(Isolate* v8_isolate, Local<UnboundScript> script);
++
+   /** Get the version string. */
+   static const char* GetVersion();
+ 
+diff --git a/deps/v8/src/api/api.cc b/deps/v8/src/api/api.cc
+index a91dfc271c..ee27d22eaf 100644
+--- a/deps/v8/src/api/api.cc
++++ b/deps/v8/src/api/api.cc
+@@ -806,6 +806,28 @@ void V8::SetFlagsFromCommandLine(int* argc, char** argv, bool remove_flags) {
+                                        HelpOptions(HelpOptions::kDontExit));
+ }
+ 
++bool save_lazy;
++bool save_predictable;
++
++void V8::EnableCompilationForSourcelessUse() {
++  save_lazy = i::FLAG_lazy;
++  i::FLAG_lazy = false;
++  save_predictable = i::FLAG_predictable;
++  i::FLAG_predictable = true;
++}
++
++void V8::DisableCompilationForSourcelessUse() {
++  i::FLAG_lazy = save_lazy;
++  i::FLAG_predictable = save_predictable;
++}
++
++void V8::FixSourcelessScript(Isolate* v8_isolate, Local<UnboundScript> unbound_script) {
++  auto isolate = reinterpret_cast<i::Isolate*>(v8_isolate);
++  auto function_info = i::Handle<i::SharedFunctionInfo>::cast(Utils::OpenHandle(*unbound_script));
++  i::Handle<i::Script> script(i::Script::cast(function_info->script()), isolate);
++  script->set_source(i::ReadOnlyRoots(isolate).undefined_value());
++}
++
+ RegisteredExtension* RegisteredExtension::first_extension_ = nullptr;
+ 
+ RegisteredExtension::RegisteredExtension(std::unique_ptr<Extension> extension)
+diff --git a/deps/v8/src/codegen/compiler.cc b/deps/v8/src/codegen/compiler.cc
+index 31c5acceeb..bced3c7165 100644
+--- a/deps/v8/src/codegen/compiler.cc
++++ b/deps/v8/src/codegen/compiler.cc
+@@ -3475,7 +3475,7 @@ MaybeHandle<SharedFunctionInfo> GetSharedFunctionInfoForScriptImpl(
+     maybe_script = lookup_result.script();
+     maybe_result = lookup_result.toplevel_sfi();
+     is_compiled_scope = lookup_result.is_compiled_scope();
+-    if (!maybe_result.is_null()) {
++    if (!maybe_result.is_null() ** source->length()) {
+       compile_timer.set_hit_isolate_cache();
+     } else if (can_consume_code_cache) {
+       compile_timer.set_consuming_code_cache();
+diff --git a/deps/v8/src/objects/js-function.cc b/deps/v8/src/objects/js-function.cc
+index 94f7a672a7..a5822dd39a 100644
+--- a/deps/v8/src/objects/js-function.cc
++++ b/deps/v8/src/objects/js-function.cc
+@@ -1280,6 +1280,9 @@ Handle<String> JSFunction::ToString(Handle<JSFunction> function) {
+     Handle<Object> maybe_class_positions = JSReceiver::GetDataProperty(
+         isolate, function, isolate->factory()->class_positions_symbol());
+     if (maybe_class_positions->IsClassPositions()) {
++      if (String::cast(Script::cast(shared_info->script()).source()).isUndefined(isolate)) {
++        return isolate->factory()->NewStringFromAsciiChecked("class {}");
++      }
+       ClassPositions class_positions =
+           ClassPositions::cast(*maybe_class_positions);
+       int start_position = class_positions.start();
+diff --git a/deps/v8/src/objects/shared-function-info-inl.h b/deps/v8/src/objects/shared-function-info-inl.h
+index 5621b15d98..722e1d18cb 100644
+--- a/deps/v8/src/objects/shared-function-info-inl.h
++++ b/deps/v8/src/objects/shared-function-info-inl.h
+@@ -635,6 +635,14 @@ bool SharedFunctionInfo::ShouldFlushCode(
+   }
+   if (!data.IsBytecodeArray()) return false;
+ 
++  Object script_obj = script();
++  if (!script_obj.IsUndefined()) {
++    Script script = Script::cast(script_obj);
++    if (script.source().IsUndefined()) {
++      return false;
++    }
++  }
++
+   if (IsStressFlushingEnabled(code_flush_mode)) return true;
+ 
+   BytecodeArray bytecode = BytecodeArray::cast(data);
+diff --git a/deps/v8/src/parsing/parsing.cc b/deps/v8/src/parsing/parsing.cc
+index 8c55a6fb6e..70bf82a57d 100644
+--- a/deps/v8/src/parsing/parsing.cc
++++ b/deps/v8/src/parsing/parsing.cc
+@@ -42,6 +42,7 @@ bool ParseProgram(ParseInfo* info, Handle<Script> script,
+                   Isolate* isolate, ReportStatisticsMode mode) {
+   DCHECK(info->flags().is_toplevel());
+   DCHECK_NULL(info->literal());
++  if (String::cast(script->source()).IsUndefined(isolate)) return false;
+ 
+   VMState<PARSER> state(isolate);
+ 
+@@ -75,6 +76,7 @@ bool ParseFunction(ParseInfo* info, Handle<SharedFunctionInfo> shared_info,
+ 
+   // Create a character stream for the parser.
+   Handle<Script> script(Script::cast(shared_info->script()), isolate);
++  if (String::cast(script->source()).IsUndefined(isolate)) return false;
+   Handle<String> source(String::cast(script->source()), isolate);
+   std::unique_ptr<Utf16CharacterStream> stream(
+       ScannerStream::For(isolate, source, shared_info->StartPosition(),
+diff --git a/deps/v8/src/snapshot/code-serializer.cc b/deps/v8/src/snapshot/code-serializer.cc
+index c83e8e4581..8cb451e147 100644
+--- a/deps/v8/src/snapshot/code-serializer.cc
++++ b/deps/v8/src/snapshot/code-serializer.cc
+@@ -659,10 +659,6 @@ SerializedCodeSanityCheckResult SerializedCodeData::SanityCheck(
+ 
+ SerializedCodeSanityCheckResult SerializedCodeData::SanityCheckJustSource(
+     uint32_t expected_source_hash) const {
+-  uint32_t source_hash = GetHeaderValue(kSourceHashOffset);
+-  if (source_hash != expected_source_hash) {
+-    return SerializedCodeSanityCheckResult::kSourceMismatch;
+-  }
+   return SerializedCodeSanityCheckResult::kSuccess;
+ }
+ 
+@@ -679,10 +675,6 @@ SerializedCodeSanityCheckResult SerializedCodeData::SanityCheckWithoutSource()
+   if (version_hash != Version::Hash()) {
+     return SerializedCodeSanityCheckResult::kVersionMismatch;
+   }
+-  uint32_t flags_hash = GetHeaderValue(kFlagHashOffset);
+-  if (flags_hash != FlagList::Hash()) {
+-    return SerializedCodeSanityCheckResult::kFlagsMismatch;
+-  }
+   uint32_t payload_length = GetHeaderValue(kPayloadLengthOffset);
+   uint32_t max_payload_length = this->size_ - kHeaderSize;
+   if (payload_length > max_payload_length) {
+diff --git a/lib/child_process.js b/lib/child_process.js
+index 449013906e..3a85e4a541 100644
+--- a/lib/child_process.js
++++ b/lib/child_process.js
+@@ -169,7 +169,7 @@ function fork(modulePath, args = [], options) {
+     throw new ERR_CHILD_PROCESS_IPC_REQUIRED('options.stdio');
+   }
+ 
+-  return spawn(options.execPath, args, options);
++  return module.exports.spawn(options.execPath, args, options);
+ }
+ 
+ function _forkChild(fd, serializationMode) {
+diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
+index b077ee386b..b4271b5951 100644
+--- a/lib/internal/modules/cjs/loader.js
++++ b/lib/internal/modules/cjs/loader.js
+@@ -95,7 +95,7 @@ const { containsModuleSyntax } = internalBinding('contextify');
+ const assert = require('internal/assert');
+ const fs = require('fs');
+ const path = require('path');
+-const { internalModuleStat } = internalBinding('fs');
++const internalModuleStat = function (f) { return require('fs').internalModuleStat(f); }
+ const { safeGetenv } = internalBinding('credentials');
+ const {
+   privateSymbols: {
+diff --git a/lib/internal/modules/package_json_reader.js b/lib/internal/modules/package_json_reader.js
+index 88c079d10d..a7eaca0574 100644
+--- a/lib/internal/modules/package_json_reader.js
++++ b/lib/internal/modules/package_json_reader.js
+@@ -12,7 +12,7 @@ const {
+ const {
+   ERR_INVALID_PACKAGE_CONFIG,
+ } = require('internal/errors').codes;
+-const { internalModuleReadJSON } = internalBinding('fs');
++const internalModuleReadJSON = function (f) { return require('fs').internalModuleReadJSON(f); }
+ const { resolve, sep, toNamespacedPath } = require('path');
+ const permission = require('internal/process/permission');
+ const { kEmptyObject } = require('internal/util');
+diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
+index 917ba90a1c..c69638deba 100644
+--- a/lib/internal/process/pre_execution.js
++++ b/lib/internal/process/pre_execution.js
+@@ -51,7 +51,11 @@ const {
+   },
+ } = require('internal/v8/startup_snapshot');
+ 
++let _alreadyPrepared = false;
++
+ function prepareMainThreadExecution(expandArgv1 = false, initializeModules = true) {
++  if (_alreadyPrepared === true) return;
++  _alreadyPrepared = true;
+   return prepareExecution({
+     expandArgv1,
+     initializeModules,
+@@ -209,7 +213,8 @@ function patchProcessObject(expandArgv1) {
+   // If requested, update process.argv[1] to replace whatever the user provided with the resolved absolute file path of
+   // the entry point.
+   if (expandArgv1 && process.argv[1] &&
+-      !StringPrototypeStartsWith(process.argv[1], '-')) {
++    !StringPrototypeStartsWith(process.argv[1], '-') &&
++    process.argv[1] !== 'PKG_DUMMY_ENTRYPOINT') {
+     // Expand process.argv[1] into a full path.
+     const path = require('path');
+     try {
+@@ -723,6 +728,7 @@ function loadPreloadModules() {
+   // For user code, we preload modules if `-r` is passed
+   const preloadModules = getOptionValue('--require');
+   if (preloadModules && preloadModules.length > 0) {
++    assert(false, '--require is not supported');
+     const {
+       Module: {
+         _preloadModules,
+diff --git a/lib/vm.js b/lib/vm.js
+index d396a3df8c..74419c83c1 100644
+--- a/lib/vm.js
++++ b/lib/vm.js
+@@ -80,6 +80,7 @@ class Script extends ContextifyScript {
+       produceCachedData = false,
+       importModuleDynamically,
+       [kParsingContext]: parsingContext,
++      sourceless = false,
+     } = options;
+ 
+     validateString(filename, 'options.filename');
+@@ -103,7 +104,8 @@ class Script extends ContextifyScript {
+             cachedData,
+             produceCachedData,
+             parsingContext,
+-            hostDefinedOptionId);
++            hostDefinedOptionId,
++            sourceless);
+     } catch (e) {
+       throw e; /* node-do-not-add-exception-line */
+     }
+diff --git a/node.gyp b/node.gyp
+index 4e614df1a9..3500b875c7 100644
+--- a/node.gyp
++++ b/node.gyp
+@@ -460,6 +460,9 @@
+     },
+ 
+     'conditions': [
++      ['target_arch=="arm64"', {
++        'cflags': ['-msign-return-address=all'], # Pointer authentication
++      }],
+       ['OS in "aix os400"', {
+         'ldflags': [
+           '-Wl,-bnoerrmsg',
+diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
+index de372400fd..2538afa37d 100644
+--- a/src/inspector_agent.cc
++++ b/src/inspector_agent.cc
+@@ -707,8 +707,6 @@ bool Agent::Start(const std::string& path,
+                               StartIoThreadAsyncCallback));
+     uv_unref(reinterpret_cast<uv_handle_t*>(&start_io_thread_async));
+     start_io_thread_async.data = this;
+-    // Ignore failure, SIGUSR1 won't work, but that should not block node start.
+-    StartDebugSignalHandler();
+ 
+     parent_env_->AddCleanupHook([](void* data) {
+       Environment* env = static_cast<Environment*>(data);
+diff --git a/src/node.cc b/src/node.cc
+index a9336a1430..c4a97eb85a 100644
+--- a/src/node.cc
++++ b/src/node.cc
+@@ -322,6 +322,8 @@ MaybeLocal<Value> StartExecution(Environment* env, StartExecutionCallback cb) {
+     return env->RunSnapshotDeserializeMain();
+   }
+ 
++  StartExecution(env, "internal/bootstrap/pkg");
++
+   if (env->worker_context() != nullptr) {
+     return StartExecution(env, "internal/main/worker_thread");
+   }
+@@ -543,14 +545,6 @@ static void PlatformInit(ProcessInitializationFlags::Flags flags) {
+   }
+ 
+   if (!(flags & ProcessInitializationFlags::kNoDefaultSignalHandling)) {
+-#if HAVE_INSPECTOR
+-    sigset_t sigmask;
+-    sigemptyset(&sigmask);
+-    sigaddset(&sigmask, SIGUSR1);
+-    const int err = pthread_sigmask(SIG_SETMASK, &sigmask, nullptr);
+-    CHECK_EQ(err, 0);
+-#endif  // HAVE_INSPECTOR
+-
+     ResetSignalHandlers();
+   }
+ 
+diff --git a/src/node_contextify.cc b/src/node_contextify.cc
+index 64860d7e56..042ecba428 100644
+--- a/src/node_contextify.cc
++++ b/src/node_contextify.cc
+@@ -75,6 +75,7 @@ using v8::String;
+ using v8::Symbol;
+ using v8::Uint32;
+ using v8::UnboundScript;
++using v8::V8;
+ using v8::Value;
+ using v8::WeakCallbackInfo;
+ 
+@@ -772,13 +773,14 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+   Local<ArrayBufferView> cached_data_buf;
+   bool produce_cached_data = false;
+   Local<Context> parsing_context = context;
++  bool sourceless = false;
+ 
+   Local<Symbol> id_symbol;
+   if (argc > 2) {
+     // new ContextifyScript(code, filename, lineOffset, columnOffset,
+     //                      cachedData, produceCachedData, parsingContext,
+     //                      hostDefinedOptionId)
+-    CHECK_EQ(argc, 8);
++    CHECK_EQ(argc, 9);
+     CHECK(args[2]->IsNumber());
+     line_offset = args[2].As<Int32>()->Value();
+     CHECK(args[3]->IsNumber());
+@@ -799,6 +801,8 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+     }
+     CHECK(args[7]->IsSymbol());
+     id_symbol = args[7].As<Symbol>();
++
++    sourceless = args[8]->IsTrue();
+   }
+ 
+   ContextifyScript* contextify_script =
+@@ -847,6 +851,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+   ShouldNotAbortOnUncaughtScope no_abort_scope(env);
+   Context::Scope scope(parsing_context);
+ 
++  if (sourceless && produce_cached_data) {
++    V8::EnableCompilationForSourcelessUse();
++  }
++
+   MaybeLocal<UnboundScript> maybe_v8_script =
+       ScriptCompiler::CompileUnboundScript(isolate, &source, compile_options);
+ 
+@@ -861,6 +869,11 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+     return;
+   }
+ 
++  if (sourceless && compile_options == ScriptCompiler::kConsumeCodeCache) {
++    if (!source.GetCachedData()->rejected) {
++      V8::FixSourcelessScript(env->isolate(), v8_script);
++    }
++  }
+   contextify_script->script_.Reset(isolate, v8_script);
+   contextify_script->script_.SetWeak();
+   contextify_script->object()->SetInternalFieldForNodeCore(kUnboundScriptSlot,
+@@ -894,6 +907,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+           .IsNothing())
+     return;
+ 
++  if (sourceless && produce_cached_data) {
++    V8::DisableCompilationForSourcelessUse();
++  }
++
+   TRACE_EVENT_END0(TRACING_CATEGORY_NODE2(vm, script), "ContextifyScript::New");
+ }
+ 
+diff --git a/src/node_main.cc b/src/node_main.cc
+index f66099a557..29624b22cf 100644
+--- a/src/node_main.cc
++++ b/src/node_main.cc
+@@ -22,6 +22,8 @@
+ #include "node.h"
+ #include <cstdio>
+ 
++int reorder(int argc, char** argv);
++
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <VersionHelpers.h>
+@@ -88,12 +90,95 @@ int wmain(int argc, wchar_t* wargv[]) {
+   }
+   argv[argc] = nullptr;
+   // Now that conversion is done, we can finally start.
+-  return node::Start(argc, argv);
++  return return reorder(argc, argv);
+ }
+ #else
+ // UNIX
+ 
+ int main(int argc, char* argv[]) {
++  return reorder(argc, argv);
++}
++#endif
++
++#include <string.h>
++
++int strlen2 (char* s) {
++  int len = 0;
++  while (*s) {
++    len += 1;
++    s += 1;
++  }
++  return len;
++}
++
++bool should_set_dummy() {
++#ifdef _WIN32
++  #define MAX_ENV_LENGTH 32767
++  wchar_t execpath_env[MAX_ENV_LENGTH];
++  DWORD result = GetEnvironmentVariableW(L"PKG_EXECPATH", execpath_env, MAX_ENV_LENGTH);
++  if (result == 0 && GetLastError() != ERROR_SUCCESS) return true;
++  return wcscmp(execpath_env, L"PKG_INVOKE_NODEJS") != 0;
++#else
++  const char* execpath_env = getenv("PKG_EXECPATH");
++  if (!execpath_env) return true;
++  return strcmp(execpath_env, "PKG_INVOKE_NODEJS") != 0;
++#endif
++}
++
++// for uv_setup_args
++int adjacent(int argc, char** argv) {
++  size_t size = 0;
++  for (int i = 0; i < argc; i++) {
++    size += strlen(argv[i]) + 1;
++  }
++  char* args = new char[size];
++  size_t pos = 0;
++  for (int i = 0; i < argc; i++) {
++    memcpy(&args[pos], argv[i], strlen(argv[i]) + 1);
++    argv[i] = &args[pos];
++    pos += strlen(argv[i]) + 1;
++  }
+   return node::Start(argc, argv);
+ }
++
++volatile char* BAKERY = (volatile char*) "\0// BAKERY // BAKERY " \
++  "// BAKERY // BAKERY // BAKERY // BAKERY // BAKERY // BAKERY " \
++  "// BAKERY // BAKERY // BAKERY // BAKERY // BAKERY // BAKERY " \
++  "// BAKERY // BAKERY // BAKERY // BAKERY // BAKERY // BAKERY ";
++
++#ifdef __clang__
++__attribute__((optnone))
++#elif defined(__GNUC__)
++__attribute__((optimize(0)))
+ #endif
++
++int load_baked(char** nargv) {
++  int c = 1;
++
++  char* bakery = (char*) BAKERY;
++  while (true) {
++    size_t width = strlen2(bakery);
++    if (width == 0) break;
++    nargv[c++] = bakery;
++    bakery += width + 1;
++  }
++
++  return c;
++}
++
++int reorder(int argc, char** argv) {
++  char** nargv = new char*[argc + 64];
++
++  nargv[0] = argv[0];
++  int c = load_baked(nargv);
++
++  if (should_set_dummy()) {
++    nargv[c++] = (char*) "PKG_DUMMY_ENTRYPOINT";
++  }
++
++  for (int i = 1; i < argc; i++) {
++    nargv[c++] = argv[i];
++  }
++
++  return adjacent(c, nargv);
++}
+diff --git a/src/node_options.cc b/src/node_options.cc
+index 29cb7fc6b2..7a27f506f5 100644
+--- a/src/node_options.cc
++++ b/src/node_options.cc
+@@ -302,6 +302,7 @@ void Parse(
+ // TODO(addaleax): Make that unnecessary.
+ 
+ DebugOptionsParser::DebugOptionsParser() {
++  return;
+ #ifndef DISABLE_SINGLE_EXECUTABLE_APPLICATION
+   if (sea::IsSingleExecutable()) return;
+ #endif
+diff --git a/tools/icu/icu-generic.gyp b/tools/icu/icu-generic.gyp
+index 2655b9e694..1d951571c7 100644
+--- a/tools/icu/icu-generic.gyp
++++ b/tools/icu/icu-generic.gyp
+@@ -52,7 +52,7 @@
+         'conditions': [
+           [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
+             'cflags': [ '-Wno-deprecated-declarations', '-Wno-strict-aliasing' ],
+-            'cflags_cc': [ '-frtti' ],
++            'cflags_cc': [ '-frtti', '-fno-lto' ],
+             'cflags_cc!': [ '-fno-rtti' ],
+           }],
+           [ 'OS == "mac" or OS == "ios"', {
diff --git a/patches/patches.json b/patches/patches.json
index a13944a9..5537cb3d 100644
--- a/patches/patches.json
+++ b/patches/patches.json
@@ -1,4 +1,5 @@
 {
+  "v20.10.0": ["node.v20.10.0.cpp.patch"],
   "v19.8.1": ["node.v19.8.1.cpp.patch"],
   "v18.18.2": ["node.v18.18.2.cpp.patch"],
   "v16.20.2": ["node.v16.20.2.cpp.patch"],

From d1afb73c2063a5370d59954f4fec954f540b7af5 Mon Sep 17 00:00:00 2001
From: G'lek Tarssza <glek@glektarssza.com>
Date: Fri, 1 Dec 2023 19:52:00 -0700
Subject: [PATCH 03/13] Update tests with NodeJS v20 checks.

---
 lib/verify.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/verify.ts b/lib/verify.ts
index fc3d3a82..c4f5432e 100644
--- a/lib/verify.ts
+++ b/lib/verify.ts
@@ -54,6 +54,9 @@ const script = `
   } else
   if (modules === 111) {
     // no cpu features anymore
+  } else {
+  if (modules === 120) {
+    // no cpu features anymore
   } else {
     assert(false, modules);
   }
@@ -91,6 +94,8 @@ const script = `
   if (modules === 108) {
   } else
   if (modules === 111) {
+  } else {
+  if (modules === 120) {
   } else {
     assert(false, modules);
   }

From a44d26059fa8a94824b963fd865532a5ab7a0947 Mon Sep 17 00:00:00 2001
From: G'lek Tarssza <glek@glektarssza.com>
Date: Fri, 1 Dec 2023 20:00:29 -0700
Subject: [PATCH 04/13] Used NodeJS v21 modules version instead of v20.

---
 lib/verify.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/verify.ts b/lib/verify.ts
index c4f5432e..0c3ad151 100644
--- a/lib/verify.ts
+++ b/lib/verify.ts
@@ -55,7 +55,7 @@ const script = `
   if (modules === 111) {
     // no cpu features anymore
   } else {
-  if (modules === 120) {
+  if (modules === 115) {
     // no cpu features anymore
   } else {
     assert(false, modules);
@@ -95,7 +95,7 @@ const script = `
   } else
   if (modules === 111) {
   } else {
-  if (modules === 120) {
+  if (modules === 115) {
   } else {
     assert(false, modules);
   }

From 0d21c2a8af83b987b11b7b9f2549c234dc77bb95 Mon Sep 17 00:00:00 2001
From: G'lek Tarssza <glek@glektarssza.com>
Date: Fri, 1 Dec 2023 20:09:55 -0700
Subject: [PATCH 05/13] Use v8 flags the right way.

---
 patches/node.v20.10.0.cpp.patch | 80 ++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/patches/node.v20.10.0.cpp.patch b/patches/node.v20.10.0.cpp.patch
index 80315e35..a022ae87 100644
--- a/patches/node.v20.10.0.cpp.patch
+++ b/patches/node.v20.10.0.cpp.patch
@@ -16,12 +16,12 @@ index 62f041ce52..4688ec0fdd 100755
 --- a/configure.py
 +++ b/configure.py
 @@ -1270,7 +1270,6 @@ def configure_node(o):
- 
+
    # Enable branch protection for arm64
    if target_arch == 'arm64':
 -    o['cflags']+=['-msign-return-address=all']
      o['variables']['arm_fpu'] = options.arm_fpu or 'neon'
- 
+
    if options.node_snapshot_main is not None:
 diff --git a/deps/v8/include/v8-initialization.h b/deps/v8/include/v8-initialization.h
 index d3e35d6ec5..6e9bbe3849 100644
@@ -30,35 +30,35 @@ index d3e35d6ec5..6e9bbe3849 100644
 @@ -89,6 +89,10 @@ class V8_EXPORT V8 {
    static void SetFlagsFromCommandLine(int* argc, char** argv,
                                        bool remove_flags);
- 
+
 +  static void EnableCompilationForSourcelessUse();
 +  static void DisableCompilationForSourcelessUse();
 +  static void FixSourcelessScript(Isolate* v8_isolate, Local<UnboundScript> script);
 +
    /** Get the version string. */
    static const char* GetVersion();
- 
+
 diff --git a/deps/v8/src/api/api.cc b/deps/v8/src/api/api.cc
-index a91dfc271c..ee27d22eaf 100644
+index a91dfc271c..a4cd4eeb31 100644
 --- a/deps/v8/src/api/api.cc
 +++ b/deps/v8/src/api/api.cc
 @@ -806,6 +806,28 @@ void V8::SetFlagsFromCommandLine(int* argc, char** argv, bool remove_flags) {
                                         HelpOptions(HelpOptions::kDontExit));
  }
- 
+
 +bool save_lazy;
 +bool save_predictable;
 +
 +void V8::EnableCompilationForSourcelessUse() {
-+  save_lazy = i::FLAG_lazy;
-+  i::FLAG_lazy = false;
-+  save_predictable = i::FLAG_predictable;
-+  i::FLAG_predictable = true;
++  save_lazy = i::v8_flags.lazy;
++  i::v8_flags.lazy = false;
++  save_predictable = i::v8_flags.predictable;
++  i::v8_flags.predictable = true;
 +}
 +
 +void V8::DisableCompilationForSourcelessUse() {
-+  i::FLAG_lazy = save_lazy;
-+  i::FLAG_predictable = save_predictable;
++  i::v8_flags.lazy = save_lazy;
++  i::v8_flags.predictable = save_predictable;
 +}
 +
 +void V8::FixSourcelessScript(Isolate* v8_isolate, Local<UnboundScript> unbound_script) {
@@ -69,7 +69,7 @@ index a91dfc271c..ee27d22eaf 100644
 +}
 +
  RegisteredExtension* RegisteredExtension::first_extension_ = nullptr;
- 
+
  RegisteredExtension::RegisteredExtension(std::unique_ptr<Extension> extension)
 diff --git a/deps/v8/src/codegen/compiler.cc b/deps/v8/src/codegen/compiler.cc
 index 31c5acceeb..bced3c7165 100644
@@ -105,7 +105,7 @@ index 5621b15d98..722e1d18cb 100644
 @@ -635,6 +635,14 @@ bool SharedFunctionInfo::ShouldFlushCode(
    }
    if (!data.IsBytecodeArray()) return false;
- 
+
 +  Object script_obj = script();
 +  if (!script_obj.IsUndefined()) {
 +    Script script = Script::cast(script_obj);
@@ -115,7 +115,7 @@ index 5621b15d98..722e1d18cb 100644
 +  }
 +
    if (IsStressFlushingEnabled(code_flush_mode)) return true;
- 
+
    BytecodeArray bytecode = BytecodeArray::cast(data);
 diff --git a/deps/v8/src/parsing/parsing.cc b/deps/v8/src/parsing/parsing.cc
 index 8c55a6fb6e..70bf82a57d 100644
@@ -126,11 +126,11 @@ index 8c55a6fb6e..70bf82a57d 100644
    DCHECK(info->flags().is_toplevel());
    DCHECK_NULL(info->literal());
 +  if (String::cast(script->source()).IsUndefined(isolate)) return false;
- 
+
    VMState<PARSER> state(isolate);
- 
+
 @@ -75,6 +76,7 @@ bool ParseFunction(ParseInfo* info, Handle<SharedFunctionInfo> shared_info,
- 
+
    // Create a character stream for the parser.
    Handle<Script> script(Script::cast(shared_info->script()), isolate);
 +  if (String::cast(script->source()).IsUndefined(isolate)) return false;
@@ -142,7 +142,7 @@ index c83e8e4581..8cb451e147 100644
 --- a/deps/v8/src/snapshot/code-serializer.cc
 +++ b/deps/v8/src/snapshot/code-serializer.cc
 @@ -659,10 +659,6 @@ SerializedCodeSanityCheckResult SerializedCodeData::SanityCheck(
- 
+
  SerializedCodeSanityCheckResult SerializedCodeData::SanityCheckJustSource(
      uint32_t expected_source_hash) const {
 -  uint32_t source_hash = GetHeaderValue(kSourceHashOffset);
@@ -151,7 +151,7 @@ index c83e8e4581..8cb451e147 100644
 -  }
    return SerializedCodeSanityCheckResult::kSuccess;
  }
- 
+
 @@ -679,10 +675,6 @@ SerializedCodeSanityCheckResult SerializedCodeData::SanityCheckWithoutSource()
    if (version_hash != Version::Hash()) {
      return SerializedCodeSanityCheckResult::kVersionMismatch;
@@ -170,11 +170,11 @@ index 449013906e..3a85e4a541 100644
 @@ -169,7 +169,7 @@ function fork(modulePath, args = [], options) {
      throw new ERR_CHILD_PROCESS_IPC_REQUIRED('options.stdio');
    }
- 
+
 -  return spawn(options.execPath, args, options);
 +  return module.exports.spawn(options.execPath, args, options);
  }
- 
+
  function _forkChild(fd, serializationMode) {
 diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
 index b077ee386b..b4271b5951 100644
@@ -209,7 +209,7 @@ index 917ba90a1c..c69638deba 100644
 @@ -51,7 +51,11 @@ const {
    },
  } = require('internal/v8/startup_snapshot');
- 
+
 +let _alreadyPrepared = false;
 +
  function prepareMainThreadExecution(expandArgv1 = false, initializeModules = true) {
@@ -246,7 +246,7 @@ index d396a3df8c..74419c83c1 100644
        [kParsingContext]: parsingContext,
 +      sourceless = false,
      } = options;
- 
+
      validateString(filename, 'options.filename');
 @@ -103,7 +104,8 @@ class Script extends ContextifyScript {
              cachedData,
@@ -264,7 +264,7 @@ index 4e614df1a9..3500b875c7 100644
 +++ b/node.gyp
 @@ -460,6 +460,9 @@
      },
- 
+
      'conditions': [
 +      ['target_arch=="arm64"', {
 +        'cflags': ['-msign-return-address=all'], # Pointer authentication
@@ -282,7 +282,7 @@ index de372400fd..2538afa37d 100644
      start_io_thread_async.data = this;
 -    // Ignore failure, SIGUSR1 won't work, but that should not block node start.
 -    StartDebugSignalHandler();
- 
+
      parent_env_->AddCleanupHook([](void* data) {
        Environment* env = static_cast<Environment*>(data);
 diff --git a/src/node.cc b/src/node.cc
@@ -292,7 +292,7 @@ index a9336a1430..c4a97eb85a 100644
 @@ -322,6 +322,8 @@ MaybeLocal<Value> StartExecution(Environment* env, StartExecutionCallback cb) {
      return env->RunSnapshotDeserializeMain();
    }
- 
+
 +  StartExecution(env, "internal/bootstrap/pkg");
 +
    if (env->worker_context() != nullptr) {
@@ -300,7 +300,7 @@ index a9336a1430..c4a97eb85a 100644
    }
 @@ -543,14 +545,6 @@ static void PlatformInit(ProcessInitializationFlags::Flags flags) {
    }
- 
+
    if (!(flags & ProcessInitializationFlags::kNoDefaultSignalHandling)) {
 -#if HAVE_INSPECTOR
 -    sigset_t sigmask;
@@ -312,7 +312,7 @@ index a9336a1430..c4a97eb85a 100644
 -
      ResetSignalHandlers();
    }
- 
+
 diff --git a/src/node_contextify.cc b/src/node_contextify.cc
 index 64860d7e56..042ecba428 100644
 --- a/src/node_contextify.cc
@@ -324,13 +324,13 @@ index 64860d7e56..042ecba428 100644
 +using v8::V8;
  using v8::Value;
  using v8::WeakCallbackInfo;
- 
+
 @@ -772,13 +773,14 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
    Local<ArrayBufferView> cached_data_buf;
    bool produce_cached_data = false;
    Local<Context> parsing_context = context;
 +  bool sourceless = false;
- 
+
    Local<Symbol> id_symbol;
    if (argc > 2) {
      // new ContextifyScript(code, filename, lineOffset, columnOffset,
@@ -348,23 +348,23 @@ index 64860d7e56..042ecba428 100644
 +
 +    sourceless = args[8]->IsTrue();
    }
- 
+
    ContextifyScript* contextify_script =
 @@ -847,6 +851,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
    ShouldNotAbortOnUncaughtScope no_abort_scope(env);
    Context::Scope scope(parsing_context);
- 
+
 +  if (sourceless && produce_cached_data) {
 +    V8::EnableCompilationForSourcelessUse();
 +  }
 +
    MaybeLocal<UnboundScript> maybe_v8_script =
        ScriptCompiler::CompileUnboundScript(isolate, &source, compile_options);
- 
+
 @@ -861,6 +869,11 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
      return;
    }
- 
+
 +  if (sourceless && compile_options == ScriptCompiler::kConsumeCodeCache) {
 +    if (!source.GetCachedData()->rejected) {
 +      V8::FixSourcelessScript(env->isolate(), v8_script);
@@ -376,14 +376,14 @@ index 64860d7e56..042ecba428 100644
 @@ -894,6 +907,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
            .IsNothing())
      return;
- 
+
 +  if (sourceless && produce_cached_data) {
 +    V8::DisableCompilationForSourcelessUse();
 +  }
 +
    TRACE_EVENT_END0(TRACING_CATEGORY_NODE2(vm, script), "ContextifyScript::New");
  }
- 
+
 diff --git a/src/node_main.cc b/src/node_main.cc
 index f66099a557..29624b22cf 100644
 --- a/src/node_main.cc
@@ -391,7 +391,7 @@ index f66099a557..29624b22cf 100644
 @@ -22,6 +22,8 @@
  #include "node.h"
  #include <cstdio>
- 
+
 +int reorder(int argc, char** argv);
 +
  #ifdef _WIN32
@@ -406,7 +406,7 @@ index f66099a557..29624b22cf 100644
  }
  #else
  // UNIX
- 
+
  int main(int argc, char* argv[]) {
 +  return reorder(argc, argv);
 +}
@@ -500,7 +500,7 @@ index 29cb7fc6b2..7a27f506f5 100644
 +++ b/src/node_options.cc
 @@ -302,6 +302,7 @@ void Parse(
  // TODO(addaleax): Make that unnecessary.
- 
+
  DebugOptionsParser::DebugOptionsParser() {
 +  return;
  #ifndef DISABLE_SINGLE_EXECUTABLE_APPLICATION

From debeefecadc9a869421165dd4c7a95ad190023ac Mon Sep 17 00:00:00 2001
From: G'lek Tarssza <glek@glektarssza.com>
Date: Fri, 1 Dec 2023 20:15:18 -0700
Subject: [PATCH 06/13] Fixed an unfortunate typo.

---
 patches/node.v20.10.0.cpp.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/node.v20.10.0.cpp.patch b/patches/node.v20.10.0.cpp.patch
index a022ae87..f51fb7a4 100644
--- a/patches/node.v20.10.0.cpp.patch
+++ b/patches/node.v20.10.0.cpp.patch
@@ -80,7 +80,7 @@ index 31c5acceeb..bced3c7165 100644
      maybe_result = lookup_result.toplevel_sfi();
      is_compiled_scope = lookup_result.is_compiled_scope();
 -    if (!maybe_result.is_null()) {
-+    if (!maybe_result.is_null() ** source->length()) {
++    if (!maybe_result.is_null() && source->length()) {
        compile_timer.set_hit_isolate_cache();
      } else if (can_consume_code_cache) {
        compile_timer.set_consuming_code_cache();

From 9e11583dab823ff7e72225848ce631df9e931a92 Mon Sep 17 00:00:00 2001
From: G'lek Tarssza <glek@glektarssza.com>
Date: Fri, 1 Dec 2023 20:46:07 -0700
Subject: [PATCH 07/13] Fixed another typo.

---
 patches/node.v20.10.0.cpp.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/node.v20.10.0.cpp.patch b/patches/node.v20.10.0.cpp.patch
index f51fb7a4..d20d6270 100644
--- a/patches/node.v20.10.0.cpp.patch
+++ b/patches/node.v20.10.0.cpp.patch
@@ -92,7 +92,7 @@ index 94f7a672a7..a5822dd39a 100644
      Handle<Object> maybe_class_positions = JSReceiver::GetDataProperty(
          isolate, function, isolate->factory()->class_positions_symbol());
      if (maybe_class_positions->IsClassPositions()) {
-+      if (String::cast(Script::cast(shared_info->script()).source()).isUndefined(isolate)) {
++      if (String::cast(Script::cast(shared_info->script()).source()).IsUndefined(isolate)) {
 +        return isolate->factory()->NewStringFromAsciiChecked("class {}");
 +      }
        ClassPositions class_positions =

From ce5feb6dcd2f63c9599beacc981f70cf54c5461a Mon Sep 17 00:00:00 2001
From: G'lek Tarssza <glek@glektarssza.com>
Date: Fri, 1 Dec 2023 22:50:30 -0700
Subject: [PATCH 08/13] Fixed missing pkg bootstrapper.

---
 patches/node.v20.10.0.cpp.patch | 125 +++++++++++++++++++++++---------
 1 file changed, 90 insertions(+), 35 deletions(-)

diff --git a/patches/node.v20.10.0.cpp.patch b/patches/node.v20.10.0.cpp.patch
index d20d6270..34991d60 100644
--- a/patches/node.v20.10.0.cpp.patch
+++ b/patches/node.v20.10.0.cpp.patch
@@ -16,12 +16,12 @@ index 62f041ce52..4688ec0fdd 100755
 --- a/configure.py
 +++ b/configure.py
 @@ -1270,7 +1270,6 @@ def configure_node(o):
-
+ 
    # Enable branch protection for arm64
    if target_arch == 'arm64':
 -    o['cflags']+=['-msign-return-address=all']
      o['variables']['arm_fpu'] = options.arm_fpu or 'neon'
-
+ 
    if options.node_snapshot_main is not None:
 diff --git a/deps/v8/include/v8-initialization.h b/deps/v8/include/v8-initialization.h
 index d3e35d6ec5..6e9bbe3849 100644
@@ -30,14 +30,14 @@ index d3e35d6ec5..6e9bbe3849 100644
 @@ -89,6 +89,10 @@ class V8_EXPORT V8 {
    static void SetFlagsFromCommandLine(int* argc, char** argv,
                                        bool remove_flags);
-
+ 
 +  static void EnableCompilationForSourcelessUse();
 +  static void DisableCompilationForSourcelessUse();
 +  static void FixSourcelessScript(Isolate* v8_isolate, Local<UnboundScript> script);
 +
    /** Get the version string. */
    static const char* GetVersion();
-
+ 
 diff --git a/deps/v8/src/api/api.cc b/deps/v8/src/api/api.cc
 index a91dfc271c..a4cd4eeb31 100644
 --- a/deps/v8/src/api/api.cc
@@ -45,7 +45,7 @@ index a91dfc271c..a4cd4eeb31 100644
 @@ -806,6 +806,28 @@ void V8::SetFlagsFromCommandLine(int* argc, char** argv, bool remove_flags) {
                                         HelpOptions(HelpOptions::kDontExit));
  }
-
+ 
 +bool save_lazy;
 +bool save_predictable;
 +
@@ -69,7 +69,7 @@ index a91dfc271c..a4cd4eeb31 100644
 +}
 +
  RegisteredExtension* RegisteredExtension::first_extension_ = nullptr;
-
+ 
  RegisteredExtension::RegisteredExtension(std::unique_ptr<Extension> extension)
 diff --git a/deps/v8/src/codegen/compiler.cc b/deps/v8/src/codegen/compiler.cc
 index 31c5acceeb..bced3c7165 100644
@@ -80,7 +80,7 @@ index 31c5acceeb..bced3c7165 100644
      maybe_result = lookup_result.toplevel_sfi();
      is_compiled_scope = lookup_result.is_compiled_scope();
 -    if (!maybe_result.is_null()) {
-+    if (!maybe_result.is_null() && source->length()) {
++    if (!maybe_result.is_null() ** source->length()) {
        compile_timer.set_hit_isolate_cache();
      } else if (can_consume_code_cache) {
        compile_timer.set_consuming_code_cache();
@@ -92,7 +92,7 @@ index 94f7a672a7..a5822dd39a 100644
      Handle<Object> maybe_class_positions = JSReceiver::GetDataProperty(
          isolate, function, isolate->factory()->class_positions_symbol());
      if (maybe_class_positions->IsClassPositions()) {
-+      if (String::cast(Script::cast(shared_info->script()).source()).IsUndefined(isolate)) {
++      if (String::cast(Script::cast(shared_info->script()).source()).isUndefined(isolate)) {
 +        return isolate->factory()->NewStringFromAsciiChecked("class {}");
 +      }
        ClassPositions class_positions =
@@ -105,7 +105,7 @@ index 5621b15d98..722e1d18cb 100644
 @@ -635,6 +635,14 @@ bool SharedFunctionInfo::ShouldFlushCode(
    }
    if (!data.IsBytecodeArray()) return false;
-
+ 
 +  Object script_obj = script();
 +  if (!script_obj.IsUndefined()) {
 +    Script script = Script::cast(script_obj);
@@ -115,7 +115,7 @@ index 5621b15d98..722e1d18cb 100644
 +  }
 +
    if (IsStressFlushingEnabled(code_flush_mode)) return true;
-
+ 
    BytecodeArray bytecode = BytecodeArray::cast(data);
 diff --git a/deps/v8/src/parsing/parsing.cc b/deps/v8/src/parsing/parsing.cc
 index 8c55a6fb6e..70bf82a57d 100644
@@ -126,11 +126,11 @@ index 8c55a6fb6e..70bf82a57d 100644
    DCHECK(info->flags().is_toplevel());
    DCHECK_NULL(info->literal());
 +  if (String::cast(script->source()).IsUndefined(isolate)) return false;
-
+ 
    VMState<PARSER> state(isolate);
-
+ 
 @@ -75,6 +76,7 @@ bool ParseFunction(ParseInfo* info, Handle<SharedFunctionInfo> shared_info,
-
+ 
    // Create a character stream for the parser.
    Handle<Script> script(Script::cast(shared_info->script()), isolate);
 +  if (String::cast(script->source()).IsUndefined(isolate)) return false;
@@ -142,7 +142,7 @@ index c83e8e4581..8cb451e147 100644
 --- a/deps/v8/src/snapshot/code-serializer.cc
 +++ b/deps/v8/src/snapshot/code-serializer.cc
 @@ -659,10 +659,6 @@ SerializedCodeSanityCheckResult SerializedCodeData::SanityCheck(
-
+ 
  SerializedCodeSanityCheckResult SerializedCodeData::SanityCheckJustSource(
      uint32_t expected_source_hash) const {
 -  uint32_t source_hash = GetHeaderValue(kSourceHashOffset);
@@ -151,7 +151,7 @@ index c83e8e4581..8cb451e147 100644
 -  }
    return SerializedCodeSanityCheckResult::kSuccess;
  }
-
+ 
 @@ -679,10 +675,6 @@ SerializedCodeSanityCheckResult SerializedCodeData::SanityCheckWithoutSource()
    if (version_hash != Version::Hash()) {
      return SerializedCodeSanityCheckResult::kVersionMismatch;
@@ -170,12 +170,67 @@ index 449013906e..3a85e4a541 100644
 @@ -169,7 +169,7 @@ function fork(modulePath, args = [], options) {
      throw new ERR_CHILD_PROCESS_IPC_REQUIRED('options.stdio');
    }
-
+ 
 -  return spawn(options.execPath, args, options);
 +  return module.exports.spawn(options.execPath, args, options);
  }
-
+ 
  function _forkChild(fd, serializationMode) {
+diff --git a/lib/internal/bootstrap/pkg.js b/lib/internal/bootstrap/pkg.js
+new file mode 100644
+index 0000000000..a697294fdf
+--- /dev/null
++++ b/lib/internal/bootstrap/pkg.js
+@@ -0,0 +1,49 @@
++'use strict';
++
++const {
++  prepareWorkerThreadExecution,
++  prepareMainThreadExecution
++} = require('internal/process/pre_execution');
++
++if (internalBinding('worker').isMainThread) {
++  prepareMainThreadExecution(true);
++} else {
++  prepareWorkerThreadExecution();
++}
++
++(function () {
++  var __require__ = require;
++  var fs = __require__('fs');
++  var vm = __require__('vm');
++  function readPrelude (fd) {
++    var PAYLOAD_POSITION = '// PAYLOAD_POSITION //' | 0;
++    var PAYLOAD_SIZE = '// PAYLOAD_SIZE //' | 0;
++    var PRELUDE_POSITION = '// PRELUDE_POSITION //' | 0;
++    var PRELUDE_SIZE = '// PRELUDE_SIZE //' | 0;
++    if (!PRELUDE_POSITION) {
++      // no prelude - remove entrypoint from argv[1]
++      process.argv.splice(1, 1);
++      return { undoPatch: true };
++    }
++    var prelude = Buffer.alloc(PRELUDE_SIZE);
++    var read = fs.readSync(fd, prelude, 0, PRELUDE_SIZE, PRELUDE_POSITION);
++    if (read !== PRELUDE_SIZE) {
++      console.error('Pkg: Error reading from file.');
++      process.exit(1);
++    }
++    var s = new vm.Script(prelude, { filename: 'pkg/prelude/bootstrap.js' });
++    var fn = s.runInThisContext();
++    return fn(process, __require__,
++      console, fd, PAYLOAD_POSITION, PAYLOAD_SIZE);
++  }
++  (function () {
++    var fd = fs.openSync(process.execPath, 'r');
++    var result = readPrelude(fd);
++    if (result && result.undoPatch) {
++      var bindingFs = process.binding('fs');
++      fs.internalModuleStat = bindingFs.internalModuleStat;
++      fs.internalModuleReadJSON = bindingFs.internalModuleReadJSON;
++      fs.closeSync(fd);
++    }
++  }());
++}());
 diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
 index b077ee386b..b4271b5951 100644
 --- a/lib/internal/modules/cjs/loader.js
@@ -209,7 +264,7 @@ index 917ba90a1c..c69638deba 100644
 @@ -51,7 +51,11 @@ const {
    },
  } = require('internal/v8/startup_snapshot');
-
+ 
 +let _alreadyPrepared = false;
 +
  function prepareMainThreadExecution(expandArgv1 = false, initializeModules = true) {
@@ -246,7 +301,7 @@ index d396a3df8c..74419c83c1 100644
        [kParsingContext]: parsingContext,
 +      sourceless = false,
      } = options;
-
+ 
      validateString(filename, 'options.filename');
 @@ -103,7 +104,8 @@ class Script extends ContextifyScript {
              cachedData,
@@ -264,7 +319,7 @@ index 4e614df1a9..3500b875c7 100644
 +++ b/node.gyp
 @@ -460,6 +460,9 @@
      },
-
+ 
      'conditions': [
 +      ['target_arch=="arm64"', {
 +        'cflags': ['-msign-return-address=all'], # Pointer authentication
@@ -282,7 +337,7 @@ index de372400fd..2538afa37d 100644
      start_io_thread_async.data = this;
 -    // Ignore failure, SIGUSR1 won't work, but that should not block node start.
 -    StartDebugSignalHandler();
-
+ 
      parent_env_->AddCleanupHook([](void* data) {
        Environment* env = static_cast<Environment*>(data);
 diff --git a/src/node.cc b/src/node.cc
@@ -292,7 +347,7 @@ index a9336a1430..c4a97eb85a 100644
 @@ -322,6 +322,8 @@ MaybeLocal<Value> StartExecution(Environment* env, StartExecutionCallback cb) {
      return env->RunSnapshotDeserializeMain();
    }
-
+ 
 +  StartExecution(env, "internal/bootstrap/pkg");
 +
    if (env->worker_context() != nullptr) {
@@ -300,7 +355,7 @@ index a9336a1430..c4a97eb85a 100644
    }
 @@ -543,14 +545,6 @@ static void PlatformInit(ProcessInitializationFlags::Flags flags) {
    }
-
+ 
    if (!(flags & ProcessInitializationFlags::kNoDefaultSignalHandling)) {
 -#if HAVE_INSPECTOR
 -    sigset_t sigmask;
@@ -312,7 +367,7 @@ index a9336a1430..c4a97eb85a 100644
 -
      ResetSignalHandlers();
    }
-
+ 
 diff --git a/src/node_contextify.cc b/src/node_contextify.cc
 index 64860d7e56..042ecba428 100644
 --- a/src/node_contextify.cc
@@ -324,13 +379,13 @@ index 64860d7e56..042ecba428 100644
 +using v8::V8;
  using v8::Value;
  using v8::WeakCallbackInfo;
-
+ 
 @@ -772,13 +773,14 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
    Local<ArrayBufferView> cached_data_buf;
    bool produce_cached_data = false;
    Local<Context> parsing_context = context;
 +  bool sourceless = false;
-
+ 
    Local<Symbol> id_symbol;
    if (argc > 2) {
      // new ContextifyScript(code, filename, lineOffset, columnOffset,
@@ -348,23 +403,23 @@ index 64860d7e56..042ecba428 100644
 +
 +    sourceless = args[8]->IsTrue();
    }
-
+ 
    ContextifyScript* contextify_script =
 @@ -847,6 +851,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
    ShouldNotAbortOnUncaughtScope no_abort_scope(env);
    Context::Scope scope(parsing_context);
-
+ 
 +  if (sourceless && produce_cached_data) {
 +    V8::EnableCompilationForSourcelessUse();
 +  }
 +
    MaybeLocal<UnboundScript> maybe_v8_script =
        ScriptCompiler::CompileUnboundScript(isolate, &source, compile_options);
-
+ 
 @@ -861,6 +869,11 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
      return;
    }
-
+ 
 +  if (sourceless && compile_options == ScriptCompiler::kConsumeCodeCache) {
 +    if (!source.GetCachedData()->rejected) {
 +      V8::FixSourcelessScript(env->isolate(), v8_script);
@@ -376,14 +431,14 @@ index 64860d7e56..042ecba428 100644
 @@ -894,6 +907,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
            .IsNothing())
      return;
-
+ 
 +  if (sourceless && produce_cached_data) {
 +    V8::DisableCompilationForSourcelessUse();
 +  }
 +
    TRACE_EVENT_END0(TRACING_CATEGORY_NODE2(vm, script), "ContextifyScript::New");
  }
-
+ 
 diff --git a/src/node_main.cc b/src/node_main.cc
 index f66099a557..29624b22cf 100644
 --- a/src/node_main.cc
@@ -391,7 +446,7 @@ index f66099a557..29624b22cf 100644
 @@ -22,6 +22,8 @@
  #include "node.h"
  #include <cstdio>
-
+ 
 +int reorder(int argc, char** argv);
 +
  #ifdef _WIN32
@@ -406,7 +461,7 @@ index f66099a557..29624b22cf 100644
  }
  #else
  // UNIX
-
+ 
  int main(int argc, char* argv[]) {
 +  return reorder(argc, argv);
 +}
@@ -500,7 +555,7 @@ index 29cb7fc6b2..7a27f506f5 100644
 +++ b/src/node_options.cc
 @@ -302,6 +302,7 @@ void Parse(
  // TODO(addaleax): Make that unnecessary.
-
+ 
  DebugOptionsParser::DebugOptionsParser() {
 +  return;
  #ifndef DISABLE_SINGLE_EXECUTABLE_APPLICATION

From 1fe757b016f2a911a69adc12976209fe72be9f86 Mon Sep 17 00:00:00 2001
From: G'lek Tarssza <glek@glektarssza.com>
Date: Sat, 2 Dec 2023 06:49:54 -0700
Subject: [PATCH 09/13] Fixed another typo.

---
 patches/node.v20.10.0.cpp.patch | 68 ++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/patches/node.v20.10.0.cpp.patch b/patches/node.v20.10.0.cpp.patch
index 34991d60..626186d8 100644
--- a/patches/node.v20.10.0.cpp.patch
+++ b/patches/node.v20.10.0.cpp.patch
@@ -16,12 +16,12 @@ index 62f041ce52..4688ec0fdd 100755
 --- a/configure.py
 +++ b/configure.py
 @@ -1270,7 +1270,6 @@ def configure_node(o):
- 
+
    # Enable branch protection for arm64
    if target_arch == 'arm64':
 -    o['cflags']+=['-msign-return-address=all']
      o['variables']['arm_fpu'] = options.arm_fpu or 'neon'
- 
+
    if options.node_snapshot_main is not None:
 diff --git a/deps/v8/include/v8-initialization.h b/deps/v8/include/v8-initialization.h
 index d3e35d6ec5..6e9bbe3849 100644
@@ -30,14 +30,14 @@ index d3e35d6ec5..6e9bbe3849 100644
 @@ -89,6 +89,10 @@ class V8_EXPORT V8 {
    static void SetFlagsFromCommandLine(int* argc, char** argv,
                                        bool remove_flags);
- 
+
 +  static void EnableCompilationForSourcelessUse();
 +  static void DisableCompilationForSourcelessUse();
 +  static void FixSourcelessScript(Isolate* v8_isolate, Local<UnboundScript> script);
 +
    /** Get the version string. */
    static const char* GetVersion();
- 
+
 diff --git a/deps/v8/src/api/api.cc b/deps/v8/src/api/api.cc
 index a91dfc271c..a4cd4eeb31 100644
 --- a/deps/v8/src/api/api.cc
@@ -45,7 +45,7 @@ index a91dfc271c..a4cd4eeb31 100644
 @@ -806,6 +806,28 @@ void V8::SetFlagsFromCommandLine(int* argc, char** argv, bool remove_flags) {
                                         HelpOptions(HelpOptions::kDontExit));
  }
- 
+
 +bool save_lazy;
 +bool save_predictable;
 +
@@ -69,7 +69,7 @@ index a91dfc271c..a4cd4eeb31 100644
 +}
 +
  RegisteredExtension* RegisteredExtension::first_extension_ = nullptr;
- 
+
  RegisteredExtension::RegisteredExtension(std::unique_ptr<Extension> extension)
 diff --git a/deps/v8/src/codegen/compiler.cc b/deps/v8/src/codegen/compiler.cc
 index 31c5acceeb..bced3c7165 100644
@@ -80,7 +80,7 @@ index 31c5acceeb..bced3c7165 100644
      maybe_result = lookup_result.toplevel_sfi();
      is_compiled_scope = lookup_result.is_compiled_scope();
 -    if (!maybe_result.is_null()) {
-+    if (!maybe_result.is_null() ** source->length()) {
++    if (!maybe_result.is_null() && source->length()) {
        compile_timer.set_hit_isolate_cache();
      } else if (can_consume_code_cache) {
        compile_timer.set_consuming_code_cache();
@@ -105,7 +105,7 @@ index 5621b15d98..722e1d18cb 100644
 @@ -635,6 +635,14 @@ bool SharedFunctionInfo::ShouldFlushCode(
    }
    if (!data.IsBytecodeArray()) return false;
- 
+
 +  Object script_obj = script();
 +  if (!script_obj.IsUndefined()) {
 +    Script script = Script::cast(script_obj);
@@ -115,7 +115,7 @@ index 5621b15d98..722e1d18cb 100644
 +  }
 +
    if (IsStressFlushingEnabled(code_flush_mode)) return true;
- 
+
    BytecodeArray bytecode = BytecodeArray::cast(data);
 diff --git a/deps/v8/src/parsing/parsing.cc b/deps/v8/src/parsing/parsing.cc
 index 8c55a6fb6e..70bf82a57d 100644
@@ -126,11 +126,11 @@ index 8c55a6fb6e..70bf82a57d 100644
    DCHECK(info->flags().is_toplevel());
    DCHECK_NULL(info->literal());
 +  if (String::cast(script->source()).IsUndefined(isolate)) return false;
- 
+
    VMState<PARSER> state(isolate);
- 
+
 @@ -75,6 +76,7 @@ bool ParseFunction(ParseInfo* info, Handle<SharedFunctionInfo> shared_info,
- 
+
    // Create a character stream for the parser.
    Handle<Script> script(Script::cast(shared_info->script()), isolate);
 +  if (String::cast(script->source()).IsUndefined(isolate)) return false;
@@ -142,7 +142,7 @@ index c83e8e4581..8cb451e147 100644
 --- a/deps/v8/src/snapshot/code-serializer.cc
 +++ b/deps/v8/src/snapshot/code-serializer.cc
 @@ -659,10 +659,6 @@ SerializedCodeSanityCheckResult SerializedCodeData::SanityCheck(
- 
+
  SerializedCodeSanityCheckResult SerializedCodeData::SanityCheckJustSource(
      uint32_t expected_source_hash) const {
 -  uint32_t source_hash = GetHeaderValue(kSourceHashOffset);
@@ -151,7 +151,7 @@ index c83e8e4581..8cb451e147 100644
 -  }
    return SerializedCodeSanityCheckResult::kSuccess;
  }
- 
+
 @@ -679,10 +675,6 @@ SerializedCodeSanityCheckResult SerializedCodeData::SanityCheckWithoutSource()
    if (version_hash != Version::Hash()) {
      return SerializedCodeSanityCheckResult::kVersionMismatch;
@@ -170,11 +170,11 @@ index 449013906e..3a85e4a541 100644
 @@ -169,7 +169,7 @@ function fork(modulePath, args = [], options) {
      throw new ERR_CHILD_PROCESS_IPC_REQUIRED('options.stdio');
    }
- 
+
 -  return spawn(options.execPath, args, options);
 +  return module.exports.spawn(options.execPath, args, options);
  }
- 
+
  function _forkChild(fd, serializationMode) {
 diff --git a/lib/internal/bootstrap/pkg.js b/lib/internal/bootstrap/pkg.js
 new file mode 100644
@@ -264,7 +264,7 @@ index 917ba90a1c..c69638deba 100644
 @@ -51,7 +51,11 @@ const {
    },
  } = require('internal/v8/startup_snapshot');
- 
+
 +let _alreadyPrepared = false;
 +
  function prepareMainThreadExecution(expandArgv1 = false, initializeModules = true) {
@@ -301,7 +301,7 @@ index d396a3df8c..74419c83c1 100644
        [kParsingContext]: parsingContext,
 +      sourceless = false,
      } = options;
- 
+
      validateString(filename, 'options.filename');
 @@ -103,7 +104,8 @@ class Script extends ContextifyScript {
              cachedData,
@@ -319,7 +319,7 @@ index 4e614df1a9..3500b875c7 100644
 +++ b/node.gyp
 @@ -460,6 +460,9 @@
      },
- 
+
      'conditions': [
 +      ['target_arch=="arm64"', {
 +        'cflags': ['-msign-return-address=all'], # Pointer authentication
@@ -337,7 +337,7 @@ index de372400fd..2538afa37d 100644
      start_io_thread_async.data = this;
 -    // Ignore failure, SIGUSR1 won't work, but that should not block node start.
 -    StartDebugSignalHandler();
- 
+
      parent_env_->AddCleanupHook([](void* data) {
        Environment* env = static_cast<Environment*>(data);
 diff --git a/src/node.cc b/src/node.cc
@@ -347,7 +347,7 @@ index a9336a1430..c4a97eb85a 100644
 @@ -322,6 +322,8 @@ MaybeLocal<Value> StartExecution(Environment* env, StartExecutionCallback cb) {
      return env->RunSnapshotDeserializeMain();
    }
- 
+
 +  StartExecution(env, "internal/bootstrap/pkg");
 +
    if (env->worker_context() != nullptr) {
@@ -355,7 +355,7 @@ index a9336a1430..c4a97eb85a 100644
    }
 @@ -543,14 +545,6 @@ static void PlatformInit(ProcessInitializationFlags::Flags flags) {
    }
- 
+
    if (!(flags & ProcessInitializationFlags::kNoDefaultSignalHandling)) {
 -#if HAVE_INSPECTOR
 -    sigset_t sigmask;
@@ -367,7 +367,7 @@ index a9336a1430..c4a97eb85a 100644
 -
      ResetSignalHandlers();
    }
- 
+
 diff --git a/src/node_contextify.cc b/src/node_contextify.cc
 index 64860d7e56..042ecba428 100644
 --- a/src/node_contextify.cc
@@ -379,13 +379,13 @@ index 64860d7e56..042ecba428 100644
 +using v8::V8;
  using v8::Value;
  using v8::WeakCallbackInfo;
- 
+
 @@ -772,13 +773,14 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
    Local<ArrayBufferView> cached_data_buf;
    bool produce_cached_data = false;
    Local<Context> parsing_context = context;
 +  bool sourceless = false;
- 
+
    Local<Symbol> id_symbol;
    if (argc > 2) {
      // new ContextifyScript(code, filename, lineOffset, columnOffset,
@@ -403,23 +403,23 @@ index 64860d7e56..042ecba428 100644
 +
 +    sourceless = args[8]->IsTrue();
    }
- 
+
    ContextifyScript* contextify_script =
 @@ -847,6 +851,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
    ShouldNotAbortOnUncaughtScope no_abort_scope(env);
    Context::Scope scope(parsing_context);
- 
+
 +  if (sourceless && produce_cached_data) {
 +    V8::EnableCompilationForSourcelessUse();
 +  }
 +
    MaybeLocal<UnboundScript> maybe_v8_script =
        ScriptCompiler::CompileUnboundScript(isolate, &source, compile_options);
- 
+
 @@ -861,6 +869,11 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
      return;
    }
- 
+
 +  if (sourceless && compile_options == ScriptCompiler::kConsumeCodeCache) {
 +    if (!source.GetCachedData()->rejected) {
 +      V8::FixSourcelessScript(env->isolate(), v8_script);
@@ -431,14 +431,14 @@ index 64860d7e56..042ecba428 100644
 @@ -894,6 +907,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
            .IsNothing())
      return;
- 
+
 +  if (sourceless && produce_cached_data) {
 +    V8::DisableCompilationForSourcelessUse();
 +  }
 +
    TRACE_EVENT_END0(TRACING_CATEGORY_NODE2(vm, script), "ContextifyScript::New");
  }
- 
+
 diff --git a/src/node_main.cc b/src/node_main.cc
 index f66099a557..29624b22cf 100644
 --- a/src/node_main.cc
@@ -446,7 +446,7 @@ index f66099a557..29624b22cf 100644
 @@ -22,6 +22,8 @@
  #include "node.h"
  #include <cstdio>
- 
+
 +int reorder(int argc, char** argv);
 +
  #ifdef _WIN32
@@ -461,7 +461,7 @@ index f66099a557..29624b22cf 100644
  }
  #else
  // UNIX
- 
+
  int main(int argc, char* argv[]) {
 +  return reorder(argc, argv);
 +}
@@ -555,7 +555,7 @@ index 29cb7fc6b2..7a27f506f5 100644
 +++ b/src/node_options.cc
 @@ -302,6 +302,7 @@ void Parse(
  // TODO(addaleax): Make that unnecessary.
- 
+
  DebugOptionsParser::DebugOptionsParser() {
 +  return;
  #ifndef DISABLE_SINGLE_EXECUTABLE_APPLICATION

From 4d783bc3c76d676a3386b81570f3029e85e19cf7 Mon Sep 17 00:00:00 2001
From: G'lek Tarssza <glek@glektarssza.com>
Date: Sat, 2 Dec 2023 07:21:19 -0700
Subject: [PATCH 10/13] Fixed yet another typo.

---
 patches/node.v20.10.0.cpp.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/node.v20.10.0.cpp.patch b/patches/node.v20.10.0.cpp.patch
index 626186d8..c977e84a 100644
--- a/patches/node.v20.10.0.cpp.patch
+++ b/patches/node.v20.10.0.cpp.patch
@@ -92,7 +92,7 @@ index 94f7a672a7..a5822dd39a 100644
      Handle<Object> maybe_class_positions = JSReceiver::GetDataProperty(
          isolate, function, isolate->factory()->class_positions_symbol());
      if (maybe_class_positions->IsClassPositions()) {
-+      if (String::cast(Script::cast(shared_info->script()).source()).isUndefined(isolate)) {
++      if (String::cast(Script::cast(shared_info->script()).source()).IsUndefined(isolate)) {
 +        return isolate->factory()->NewStringFromAsciiChecked("class {}");
 +      }
        ClassPositions class_positions =

From 16aee350393e4ad5d1a6dd4a0ed759e041a90e09 Mon Sep 17 00:00:00 2001
From: G'lek Tarssza <glek@glektarssza.com>
Date: Sat, 2 Dec 2023 08:53:23 -0700
Subject: [PATCH 11/13] Trying to fix sourceless arg.

---
 patches/node.v20.10.0.cpp.patch | 91 +++++++++++++++++----------------
 1 file changed, 47 insertions(+), 44 deletions(-)

diff --git a/patches/node.v20.10.0.cpp.patch b/patches/node.v20.10.0.cpp.patch
index c977e84a..69607cb0 100644
--- a/patches/node.v20.10.0.cpp.patch
+++ b/patches/node.v20.10.0.cpp.patch
@@ -16,12 +16,12 @@ index 62f041ce52..4688ec0fdd 100755
 --- a/configure.py
 +++ b/configure.py
 @@ -1270,7 +1270,6 @@ def configure_node(o):
-
+ 
    # Enable branch protection for arm64
    if target_arch == 'arm64':
 -    o['cflags']+=['-msign-return-address=all']
      o['variables']['arm_fpu'] = options.arm_fpu or 'neon'
-
+ 
    if options.node_snapshot_main is not None:
 diff --git a/deps/v8/include/v8-initialization.h b/deps/v8/include/v8-initialization.h
 index d3e35d6ec5..6e9bbe3849 100644
@@ -30,14 +30,14 @@ index d3e35d6ec5..6e9bbe3849 100644
 @@ -89,6 +89,10 @@ class V8_EXPORT V8 {
    static void SetFlagsFromCommandLine(int* argc, char** argv,
                                        bool remove_flags);
-
+ 
 +  static void EnableCompilationForSourcelessUse();
 +  static void DisableCompilationForSourcelessUse();
 +  static void FixSourcelessScript(Isolate* v8_isolate, Local<UnboundScript> script);
 +
    /** Get the version string. */
    static const char* GetVersion();
-
+ 
 diff --git a/deps/v8/src/api/api.cc b/deps/v8/src/api/api.cc
 index a91dfc271c..a4cd4eeb31 100644
 --- a/deps/v8/src/api/api.cc
@@ -45,7 +45,7 @@ index a91dfc271c..a4cd4eeb31 100644
 @@ -806,6 +806,28 @@ void V8::SetFlagsFromCommandLine(int* argc, char** argv, bool remove_flags) {
                                         HelpOptions(HelpOptions::kDontExit));
  }
-
+ 
 +bool save_lazy;
 +bool save_predictable;
 +
@@ -69,10 +69,10 @@ index a91dfc271c..a4cd4eeb31 100644
 +}
 +
  RegisteredExtension* RegisteredExtension::first_extension_ = nullptr;
-
+ 
  RegisteredExtension::RegisteredExtension(std::unique_ptr<Extension> extension)
 diff --git a/deps/v8/src/codegen/compiler.cc b/deps/v8/src/codegen/compiler.cc
-index 31c5acceeb..bced3c7165 100644
+index 31c5acceeb..56cad8671f 100644
 --- a/deps/v8/src/codegen/compiler.cc
 +++ b/deps/v8/src/codegen/compiler.cc
 @@ -3475,7 +3475,7 @@ MaybeHandle<SharedFunctionInfo> GetSharedFunctionInfoForScriptImpl(
@@ -85,7 +85,7 @@ index 31c5acceeb..bced3c7165 100644
      } else if (can_consume_code_cache) {
        compile_timer.set_consuming_code_cache();
 diff --git a/deps/v8/src/objects/js-function.cc b/deps/v8/src/objects/js-function.cc
-index 94f7a672a7..a5822dd39a 100644
+index 94f7a672a7..57bb3fc7f1 100644
 --- a/deps/v8/src/objects/js-function.cc
 +++ b/deps/v8/src/objects/js-function.cc
 @@ -1280,6 +1280,9 @@ Handle<String> JSFunction::ToString(Handle<JSFunction> function) {
@@ -105,7 +105,7 @@ index 5621b15d98..722e1d18cb 100644
 @@ -635,6 +635,14 @@ bool SharedFunctionInfo::ShouldFlushCode(
    }
    if (!data.IsBytecodeArray()) return false;
-
+ 
 +  Object script_obj = script();
 +  if (!script_obj.IsUndefined()) {
 +    Script script = Script::cast(script_obj);
@@ -115,7 +115,7 @@ index 5621b15d98..722e1d18cb 100644
 +  }
 +
    if (IsStressFlushingEnabled(code_flush_mode)) return true;
-
+ 
    BytecodeArray bytecode = BytecodeArray::cast(data);
 diff --git a/deps/v8/src/parsing/parsing.cc b/deps/v8/src/parsing/parsing.cc
 index 8c55a6fb6e..70bf82a57d 100644
@@ -126,11 +126,11 @@ index 8c55a6fb6e..70bf82a57d 100644
    DCHECK(info->flags().is_toplevel());
    DCHECK_NULL(info->literal());
 +  if (String::cast(script->source()).IsUndefined(isolate)) return false;
-
+ 
    VMState<PARSER> state(isolate);
-
+ 
 @@ -75,6 +76,7 @@ bool ParseFunction(ParseInfo* info, Handle<SharedFunctionInfo> shared_info,
-
+ 
    // Create a character stream for the parser.
    Handle<Script> script(Script::cast(shared_info->script()), isolate);
 +  if (String::cast(script->source()).IsUndefined(isolate)) return false;
@@ -142,7 +142,7 @@ index c83e8e4581..8cb451e147 100644
 --- a/deps/v8/src/snapshot/code-serializer.cc
 +++ b/deps/v8/src/snapshot/code-serializer.cc
 @@ -659,10 +659,6 @@ SerializedCodeSanityCheckResult SerializedCodeData::SanityCheck(
-
+ 
  SerializedCodeSanityCheckResult SerializedCodeData::SanityCheckJustSource(
      uint32_t expected_source_hash) const {
 -  uint32_t source_hash = GetHeaderValue(kSourceHashOffset);
@@ -151,7 +151,7 @@ index c83e8e4581..8cb451e147 100644
 -  }
    return SerializedCodeSanityCheckResult::kSuccess;
  }
-
+ 
 @@ -679,10 +675,6 @@ SerializedCodeSanityCheckResult SerializedCodeData::SanityCheckWithoutSource()
    if (version_hash != Version::Hash()) {
      return SerializedCodeSanityCheckResult::kVersionMismatch;
@@ -170,11 +170,11 @@ index 449013906e..3a85e4a541 100644
 @@ -169,7 +169,7 @@ function fork(modulePath, args = [], options) {
      throw new ERR_CHILD_PROCESS_IPC_REQUIRED('options.stdio');
    }
-
+ 
 -  return spawn(options.execPath, args, options);
 +  return module.exports.spawn(options.execPath, args, options);
  }
-
+ 
  function _forkChild(fd, serializationMode) {
 diff --git a/lib/internal/bootstrap/pkg.js b/lib/internal/bootstrap/pkg.js
 new file mode 100644
@@ -264,7 +264,7 @@ index 917ba90a1c..c69638deba 100644
 @@ -51,7 +51,11 @@ const {
    },
  } = require('internal/v8/startup_snapshot');
-
+ 
 +let _alreadyPrepared = false;
 +
  function prepareMainThreadExecution(expandArgv1 = false, initializeModules = true) {
@@ -301,7 +301,7 @@ index d396a3df8c..74419c83c1 100644
        [kParsingContext]: parsingContext,
 +      sourceless = false,
      } = options;
-
+ 
      validateString(filename, 'options.filename');
 @@ -103,7 +104,8 @@ class Script extends ContextifyScript {
              cachedData,
@@ -319,7 +319,7 @@ index 4e614df1a9..3500b875c7 100644
 +++ b/node.gyp
 @@ -460,6 +460,9 @@
      },
-
+ 
      'conditions': [
 +      ['target_arch=="arm64"', {
 +        'cflags': ['-msign-return-address=all'], # Pointer authentication
@@ -337,7 +337,7 @@ index de372400fd..2538afa37d 100644
      start_io_thread_async.data = this;
 -    // Ignore failure, SIGUSR1 won't work, but that should not block node start.
 -    StartDebugSignalHandler();
-
+ 
      parent_env_->AddCleanupHook([](void* data) {
        Environment* env = static_cast<Environment*>(data);
 diff --git a/src/node.cc b/src/node.cc
@@ -347,7 +347,7 @@ index a9336a1430..c4a97eb85a 100644
 @@ -322,6 +322,8 @@ MaybeLocal<Value> StartExecution(Environment* env, StartExecutionCallback cb) {
      return env->RunSnapshotDeserializeMain();
    }
-
+ 
 +  StartExecution(env, "internal/bootstrap/pkg");
 +
    if (env->worker_context() != nullptr) {
@@ -355,7 +355,7 @@ index a9336a1430..c4a97eb85a 100644
    }
 @@ -543,14 +545,6 @@ static void PlatformInit(ProcessInitializationFlags::Flags flags) {
    }
-
+ 
    if (!(flags & ProcessInitializationFlags::kNoDefaultSignalHandling)) {
 -#if HAVE_INSPECTOR
 -    sigset_t sigmask;
@@ -367,9 +367,9 @@ index a9336a1430..c4a97eb85a 100644
 -
      ResetSignalHandlers();
    }
-
+ 
 diff --git a/src/node_contextify.cc b/src/node_contextify.cc
-index 64860d7e56..042ecba428 100644
+index 64860d7e56..abdb5593ba 100644
 --- a/src/node_contextify.cc
 +++ b/src/node_contextify.cc
 @@ -75,6 +75,7 @@ using v8::String;
@@ -379,47 +379,50 @@ index 64860d7e56..042ecba428 100644
 +using v8::V8;
  using v8::Value;
  using v8::WeakCallbackInfo;
-
+ 
 @@ -772,13 +773,14 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
    Local<ArrayBufferView> cached_data_buf;
    bool produce_cached_data = false;
    Local<Context> parsing_context = context;
 +  bool sourceless = false;
-
+ 
    Local<Symbol> id_symbol;
    if (argc > 2) {
      // new ContextifyScript(code, filename, lineOffset, columnOffset,
      //                      cachedData, produceCachedData, parsingContext,
-     //                      hostDefinedOptionId)
+-    //                      hostDefinedOptionId)
 -    CHECK_EQ(argc, 8);
-+    CHECK_EQ(argc, 9);
++    //                      hostDefinedOptionId, sourceless)
++    CHECK_GE(argc, 8);
      CHECK(args[2]->IsNumber());
      line_offset = args[2].As<Int32>()->Value();
      CHECK(args[3]->IsNumber());
-@@ -799,6 +801,8 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+@@ -799,6 +801,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
      }
      CHECK(args[7]->IsSymbol());
      id_symbol = args[7].As<Symbol>();
-+
-+    sourceless = args[8]->IsTrue();
++    if (argc > 8) {
++      CHECK(args[8]->IsBoolean());
++      sourceless = args[8]->IsTrue();
++    }
    }
-
+ 
    ContextifyScript* contextify_script =
-@@ -847,6 +851,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+@@ -847,6 +853,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
    ShouldNotAbortOnUncaughtScope no_abort_scope(env);
    Context::Scope scope(parsing_context);
-
+ 
 +  if (sourceless && produce_cached_data) {
 +    V8::EnableCompilationForSourcelessUse();
 +  }
 +
    MaybeLocal<UnboundScript> maybe_v8_script =
        ScriptCompiler::CompileUnboundScript(isolate, &source, compile_options);
-
-@@ -861,6 +869,11 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+ 
+@@ -861,6 +871,11 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
      return;
    }
-
+ 
 +  if (sourceless && compile_options == ScriptCompiler::kConsumeCodeCache) {
 +    if (!source.GetCachedData()->rejected) {
 +      V8::FixSourcelessScript(env->isolate(), v8_script);
@@ -428,17 +431,17 @@ index 64860d7e56..042ecba428 100644
    contextify_script->script_.Reset(isolate, v8_script);
    contextify_script->script_.SetWeak();
    contextify_script->object()->SetInternalFieldForNodeCore(kUnboundScriptSlot,
-@@ -894,6 +907,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
+@@ -894,6 +909,10 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
            .IsNothing())
      return;
-
+ 
 +  if (sourceless && produce_cached_data) {
 +    V8::DisableCompilationForSourcelessUse();
 +  }
 +
    TRACE_EVENT_END0(TRACING_CATEGORY_NODE2(vm, script), "ContextifyScript::New");
  }
-
+ 
 diff --git a/src/node_main.cc b/src/node_main.cc
 index f66099a557..29624b22cf 100644
 --- a/src/node_main.cc
@@ -446,7 +449,7 @@ index f66099a557..29624b22cf 100644
 @@ -22,6 +22,8 @@
  #include "node.h"
  #include <cstdio>
-
+ 
 +int reorder(int argc, char** argv);
 +
  #ifdef _WIN32
@@ -461,7 +464,7 @@ index f66099a557..29624b22cf 100644
  }
  #else
  // UNIX
-
+ 
  int main(int argc, char* argv[]) {
 +  return reorder(argc, argv);
 +}
@@ -555,7 +558,7 @@ index 29cb7fc6b2..7a27f506f5 100644
 +++ b/src/node_options.cc
 @@ -302,6 +302,7 @@ void Parse(
  // TODO(addaleax): Make that unnecessary.
-
+ 
  DebugOptionsParser::DebugOptionsParser() {
 +  return;
  #ifndef DISABLE_SINGLE_EXECUTABLE_APPLICATION

From 2b6ffee7ec489e1d9f7a5a6018300b149f645f88 Mon Sep 17 00:00:00 2001
From: G'lek Tarssza <glek@glektarssza.com>
Date: Sat, 2 Dec 2023 12:46:22 -0700
Subject: [PATCH 12/13] I cannot type apparently.

---
 lib/verify.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/verify.ts b/lib/verify.ts
index 0c3ad151..fd0f2754 100644
--- a/lib/verify.ts
+++ b/lib/verify.ts
@@ -54,7 +54,7 @@ const script = `
   } else
   if (modules === 111) {
     // no cpu features anymore
-  } else {
+  } else
   if (modules === 115) {
     // no cpu features anymore
   } else {
@@ -94,7 +94,7 @@ const script = `
   if (modules === 108) {
   } else
   if (modules === 111) {
-  } else {
+  } else
   if (modules === 115) {
   } else {
     assert(false, modules);

From 40e79e3fe131cc788eb77dbeccc536f087cd3f4b Mon Sep 17 00:00:00 2001
From: G'lek Tarssza <glek@glektarssza.com>
Date: Sat, 2 Dec 2023 12:50:17 -0700
Subject: [PATCH 13/13] Update all builds to also target NodeJS v20.

---
 .github/workflows/build-alpine.yml      | 2 +-
 .github/workflows/build-linux.yml       | 2 +-
 .github/workflows/build-linuxstatic.yml | 2 +-
 .github/workflows/build-macos.yml       | 2 +-
 .github/workflows/build-windows.yml     | 2 +-
 .github/workflows/ci.yml                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-alpine.yml b/.github/workflows/build-alpine.yml
index d1290683..b2d475a1 100644
--- a/.github/workflows/build-alpine.yml
+++ b/.github/workflows/build-alpine.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target-node: [14, 16, 18, 19]
+        target-node: [14, 16, 18, 19, 20]
         target-arch: [x64, arm64]
         include:
           - target-arch: x64
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index 469b311f..7a567627 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target-node: [14, 16, 18, 19]
+        target-node: [14, 16, 18, 19, 20]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/build-linuxstatic.yml b/.github/workflows/build-linuxstatic.yml
index 58c9ae11..1c1af06a 100644
--- a/.github/workflows/build-linuxstatic.yml
+++ b/.github/workflows/build-linuxstatic.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target-node: [14, 16, 18, 19]
+        target-node: [14, 16, 18, 19, 20]
         target-arch: [x64, arm64, armv7]
         include:
           - target-arch: x64
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index ff23ec9e..50c4fc21 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target-node: [14, 16, 18, 19]
+        target-node: [14, 16, 18, 19, 20]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 3f1c4d64..fc05f24b 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target-node: [14, 16, 18, 19]
+        target-node: [14, 16, 18, 19, 20]
         target-arch: [x64, arm64]
 
     steps:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19c4ed98..96253591 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false # prevent test to stop if one fails
       matrix:
-        node-version: [12, 14, 16, 18, 19] # match patched node versions
+        node-version: [12, 14, 16, 18, 19, 20] # match patched node versions
         os: [ubuntu-latest] # Skip macos-latest, windows-latest for now
 
     runs-on: ${{ matrix.os }}