bootstrap: support more builtins in the embedded code cache

This patch: - Make NativeModuleLoader::LookupAndCompile() detect parameters based on module IDs. This allows us to compile more builtins when generating the embedded bootstrap, including - internal/per_context/* - internal/bootstrap/* - internal/main/* - Move pre_execution.js to lib/internal/process as it needs to be compiled as a regular built-in module, unlike other scripts in lib/internal/bootstrap - Move markBootstrapComplete() to the performance binding instead of making it a function-wrapper-based global to reduce number of special cases. PR-URL: nodejs#44018 Reviewed-By: Chengzhong Wu <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
Fyko · Sep 15, 2022 · 94d5997 · 94d5997
1 parent 20a7370
commit 94d5997
Show file tree

Hide file tree

Showing 27 changed files with 156 additions and 137 deletions.
diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -326,6 +326,8 @@ class NativeModule {
         requireWithFallbackInDeps : nativeModuleRequire;
 
       const fn = compileFunction(id);
+      // Arguments must match the parameters specified in
+      // NativeModuleLoader::LookupAndCompile().
       fn(this.exports, requireFn, this, process, internalBinding, primordials);
 
       this.loaded = true;

diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
@@ -6,7 +6,7 @@
 //
 // This file is expected not to perform any asynchronous operations itself
 // when being executed - those should be done in either
-// `lib/internal/bootstrap/pre_execution.js` or in main scripts. The majority
+// `lib/internal/process/pre_execution.js` or in main scripts. The majority
 // of the code here focuses on setting up the global proxy and the process
 // object in a synchronous manner.
 // As special caution is given to the performance of the startup process,
@@ -28,7 +28,7 @@
 // Then, depending on how the Node.js instance is launched, one of the main
 // scripts in `lib/internal/main` will be selected by C++ to start the actual
 // execution. They may run additional setups exported by
-// `lib/internal/bootstrap/pre_execution.js` depending on the runtime states.
+// `lib/internal/process/pre_execution.js` depending on the runtime states.
 
 'use strict';
 

diff --git a/lib/internal/main/.eslintrc.yaml b/lib/internal/main/.eslintrc.yaml
diff --git a/lib/internal/main/check_syntax.js b/lib/internal/main/check_syntax.js
@@ -5,8 +5,9 @@
 
 const { getOptionValue } = require('internal/options');
 const {
-  prepareMainThreadExecution
-} = require('internal/bootstrap/pre_execution');
+  prepareMainThreadExecution,
+  markBootstrapComplete
+} = require('internal/process/pre_execution');
 
 const {
   readStdin

diff --git a/lib/internal/bootstrap/environment.js → lib/internal/main/environment.js b/lib/internal/bootstrap/environment.js → lib/internal/main/environment.js
@@ -4,10 +4,10 @@
 // that depends on run time states.
 // It is currently only intended for preparing contexts for embedders.
 
-/* global markBootstrapComplete */
 const {
-  prepareMainThreadExecution
-} = require('internal/bootstrap/pre_execution');
+  prepareMainThreadExecution,
+  markBootstrapComplete
+} = require('internal/process/pre_execution');
 
 prepareMainThreadExecution();
 markBootstrapComplete();
diff --git a/lib/internal/main/eval_stdin.js b/lib/internal/main/eval_stdin.js
@@ -3,8 +3,9 @@
 // Stdin is not a TTY, we will read it and execute it.
 
 const {
-  prepareMainThreadExecution
-} = require('internal/bootstrap/pre_execution');
+  prepareMainThreadExecution,
+  markBootstrapComplete
+} = require('internal/process/pre_execution');
 
 const { getOptionValue } = require('internal/options');
 

diff --git a/lib/internal/main/eval_string.js b/lib/internal/main/eval_string.js
@@ -8,8 +8,9 @@ const {
 } = primordials;
 
 const {
-  prepareMainThreadExecution
-} = require('internal/bootstrap/pre_execution');
+  prepareMainThreadExecution,
+  markBootstrapComplete
+} = require('internal/process/pre_execution');
 const { evalModule, evalScript } = require('internal/process/execution');
 const { addBuiltinLibsToObject } = require('internal/modules/cjs/helpers');
 

diff --git a/lib/internal/main/inspect.js b/lib/internal/main/inspect.js
@@ -3,8 +3,9 @@
 // `node inspect ...` or `node debug ...`
 
 const {
-  prepareMainThreadExecution
-} = require('internal/bootstrap/pre_execution');
+  prepareMainThreadExecution,
+  markBootstrapComplete
+} = require('internal/process/pre_execution');
 
 prepareMainThreadExecution();
 

diff --git a/lib/internal/main/mksnapshot.js b/lib/internal/main/mksnapshot.js
@@ -114,7 +114,7 @@ function requireForUserSnapshot(id) {
 function main() {
   const {
     prepareMainThreadExecution
-  } = require('internal/bootstrap/pre_execution');
+  } = require('internal/process/pre_execution');
 
   prepareMainThreadExecution(true, false);
 

diff --git a/lib/internal/main/print_help.js b/lib/internal/main/print_help.js
@@ -20,8 +20,9 @@ const { types } = internalBinding('options');
 const hasCrypto = Boolean(process.versions.openssl);
 
 const {
-  prepareMainThreadExecution
-} = require('internal/bootstrap/pre_execution');
+  prepareMainThreadExecution,
+  markBootstrapComplete
+} = require('internal/process/pre_execution');
 
 const typeLookup = [];
 for (const key of ObjectKeys(types))

diff --git a/lib/internal/main/prof_process.js b/lib/internal/main/prof_process.js
@@ -1,8 +1,9 @@
 'use strict';
 
 const {
-  prepareMainThreadExecution
-} = require('internal/bootstrap/pre_execution');
+  prepareMainThreadExecution,
+  markBootstrapComplete
+} = require('internal/process/pre_execution');
 
 prepareMainThreadExecution();
 markBootstrapComplete();

diff --git a/lib/internal/main/repl.js b/lib/internal/main/repl.js
@@ -4,8 +4,9 @@
 // the main module is not specified and stdin is a TTY.
 
 const {
-  prepareMainThreadExecution
-} = require('internal/bootstrap/pre_execution');
+  prepareMainThreadExecution,
+  markBootstrapComplete
+} = require('internal/process/pre_execution');
 
 const esmLoader = require('internal/process/esm_loader');
 const {

diff --git a/lib/internal/main/run_main_module.js b/lib/internal/main/run_main_module.js
@@ -1,8 +1,9 @@
 'use strict';
 
 const {
-  prepareMainThreadExecution
-} = require('internal/bootstrap/pre_execution');
+  prepareMainThreadExecution,
+  markBootstrapComplete
+} = require('internal/process/pre_execution');
 
 prepareMainThreadExecution(true);
 

diff --git a/lib/internal/main/test_runner.js b/lib/internal/main/test_runner.js
@@ -12,7 +12,8 @@ const {
 } = primordials;
 const {
   prepareMainThreadExecution,
-} = require('internal/bootstrap/pre_execution');
+  markBootstrapComplete
+} = require('internal/process/pre_execution');
 const { spawn } = require('child_process');
 const { readdirSync, statSync } = require('fs');
 const console = require('internal/console/global');

diff --git a/lib/internal/main/worker_thread.js b/lib/internal/main/worker_thread.js
@@ -30,8 +30,9 @@ const {
   initializeReport,
   initializeSourceMapsHandlers,
   loadPreloadModules,
-  setupTraceCategoryState
-} = require('internal/bootstrap/pre_execution');
+  setupTraceCategoryState,
+  markBootstrapComplete
+} = require('internal/process/pre_execution');
 
 const {
   threadId,

diff --git a/lib/internal/bootstrap/pre_execution.js → lib/internal/process/pre_execution.js b/lib/internal/bootstrap/pre_execution.js → lib/internal/process/pre_execution.js
@@ -596,6 +596,10 @@ function loadPreloadModules() {
   }
 }
 
+function markBootstrapComplete() {
+  internalBinding('performance').markBootstrapComplete();
+}
+
 module.exports = {
   refreshRuntimeOptions,
   patchProcessObject,
@@ -616,5 +620,6 @@ module.exports = {
   setupInspectorHooks,
   initializeReport,
   initializeCJSLoader,
-  initializeWASI
+  initializeWASI,
+  markBootstrapComplete
 };
diff --git a/lib/internal/v8/startup_snapshot.js b/lib/internal/v8/startup_snapshot.js
@@ -12,7 +12,6 @@ const {
   setSerializeCallback,
   setDeserializeCallback,
   setDeserializeMainFunction: _setDeserializeMainFunction,
-  markBootstrapComplete
 } = internalBinding('mksnapshot');
 
 function isBuildingSnapshot() {
@@ -87,8 +86,9 @@ function setDeserializeMainFunction(callback, data) {
 
   _setDeserializeMainFunction(function deserializeMain() {
     const {
-      prepareMainThreadExecution
-    } = require('internal/bootstrap/pre_execution');
+      prepareMainThreadExecution,
+      markBootstrapComplete
+    } = require('internal/process/pre_execution');
 
     // This should be in sync with run_main_module.js until we make that
     // a built-in main function.

diff --git a/lib/internal/wasm_web_api.js b/lib/internal/wasm_web_api.js
@@ -15,7 +15,7 @@ function lazyUndici() {
 
 // This is essentially an implementation of a v8::WasmStreamingCallback, except
 // that it is implemented in JavaScript because the fetch() implementation is
-// difficult to use from C++. See lib/internal/bootstrap/pre_execution.js and
+// difficult to use from C++. See lib/internal/process/pre_execution.js and
 // src/node_wasm_web_api.cc that interact with this function.
 function wasmStreamingCallback(streamState, source) {
   (async () => {

diff --git a/src/api/environment.cc b/src/api/environment.cc
@@ -452,13 +452,12 @@ MaybeLocal<Value> LoadEnvironment(
         native_module::NativeModuleLoader::Add(
             name.c_str(), UnionBytes(**main_utf16, main_utf16->length()));
         env->set_main_utf16(std::move(main_utf16));
-        std::vector<Local<String>> params = {
-            env->process_string(),
-            env->require_string()};
+        // Arguments must match the parameters specified in
+        // NativeModuleLoader::LookupAndCompile().
         std::vector<Local<Value>> args = {
             env->process_object(),
             env->native_module_require()};
-        return ExecuteBootstrapper(env, name.c_str(), &params, &args);
+        return ExecuteBootstrapper(env, name.c_str(), &args);
       });
 }
 
@@ -683,8 +682,6 @@ Maybe<bool> InitializePrimordials(Local<Context> context) {
 
   Local<String> primordials_string =
       FIXED_ONE_BYTE_STRING(isolate, "primordials");
-  Local<String> global_string = FIXED_ONE_BYTE_STRING(isolate, "global");
-  Local<String> exports_string = FIXED_ONE_BYTE_STRING(isolate, "exports");
 
   // Create primordials first and make it available to per-context scripts.
   Local<Object> primordials = Object::New(isolate);
@@ -700,12 +697,12 @@ Maybe<bool> InitializePrimordials(Local<Context> context) {
                                         nullptr};
 
   for (const char** module = context_files; *module != nullptr; module++) {
-    std::vector<Local<String>> parameters = {
-        global_string, exports_string, primordials_string};
+    // Arguments must match the parameters specified in
+    // NativeModuleLoader::LookupAndCompile().
     Local<Value> arguments[] = {context->Global(), exports, primordials};
     MaybeLocal<Function> maybe_fn =
         native_module::NativeModuleLoader::LookupAndCompile(
-            context, *module, &parameters, nullptr);
+            context, *module, nullptr);
     Local<Function> fn;
     if (!maybe_fn.ToLocal(&fn)) {
       return Nothing<bool>();