Skip to content

Commit a4c8645

Browse files
joyeecheungjoyeecheung
committed
bootstrap: generate bootstrapper arguments in BuiltinLoader
1 parent addb726 commit a4c8645

File tree

6 files changed

+103
-78
lines changed

6 files changed

+103
-78
lines changed

‎src/api/environment.cc‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -456,11 +456,7 @@ MaybeLocal<Value> LoadEnvironment(
456456
env->set_main_utf16(std::move(main_utf16));
457457
Realm* realm = env->principal_realm();
458458

459-
// Arguments must match the parameters specified in
460-
// BuiltinLoader::LookupAndCompile().
461-
std::vector<Local<Value>> args = {realm->process_object(),
462-
realm->builtin_module_require()};
463-
return realm->ExecuteBootstrapper(name.c_str(), &args);
459+
return realm->ExecuteBootstrapper(name.c_str());
464460
});
465461
}
466462

@@ -699,19 +695,11 @@ Maybe<bool> InitializePrimordials(Local<Context> context) {
699695
nullptr};
700696

701697
for (const char** module = context_files; *module != nullptr; module++) {
702-
// Arguments must match the parameters specified in
703-
// BuiltinLoader::LookupAndCompile().
704698
Local<Value> arguments[] = {exports, primordials};
705-
MaybeLocal<Function> maybe_fn =
706-
builtins::BuiltinLoader::LookupAndCompile(context, *module, nullptr);
707-
Local<Function> fn;
708-
if (!maybe_fn.ToLocal(&fn)) {
709-
return Nothing<bool>();
710-
}
711-
MaybeLocal<Value> result =
712-
fn->Call(context, Undefined(isolate), arraysize(arguments), arguments);
713-
// Execution failed during context creation.
714-
if (result.IsEmpty()) {
699+
if (builtins::BuiltinLoader::CompileAndCall(
700+
context, *module, arraysize(arguments), arguments, nullptr)
701+
.IsEmpty()) {
702+
// Execution failed during context creation.
715703
return Nothing<bool>();
716704
}
717705
}

‎src/node.cc‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -262,15 +262,7 @@ MaybeLocal<Value> StartExecution(Environment* env, const char* main_script_id) {
262262
CHECK_NOT_NULL(main_script_id);
263263
Realm* realm = env->principal_realm();
264264

265-
// Arguments must match the parameters specified in
266-
// BuiltinLoader::LookupAndCompile().
267-
std::vector<Local<Value>> arguments = {env->process_object(),
268-
env->builtin_module_require(),
269-
env->internal_binding_loader(),
270-
env->primordials()};
271-
272-
return scope.EscapeMaybe(
273-
realm->ExecuteBootstrapper(main_script_id, &arguments));
265+
return scope.EscapeMaybe(realm->ExecuteBootstrapper(main_script_id));
274266
}
275267

276268
MaybeLocal<Value> StartExecution(Environment* env, StartExecutionCallback cb) {

‎src/node_builtins.cc‎

Lines changed: 77 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ using v8::ScriptOrigin;
2626
using v8::Set;
2727
using v8::SideEffectType;
2828
using v8::String;
29+
using v8::Undefined;
2930
using v8::Value;
3031

3132
BuiltinLoader BuiltinLoader::instance_;
@@ -352,8 +353,12 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompile(
352353
FIXED_ONE_BYTE_STRING(isolate, "exports"),
353354
FIXED_ONE_BYTE_STRING(isolate, "primordials"),
354355
};
355-
} else if (strncmp(id, "internal/main/", strlen("internal/main/")) == 0) {
356-
// internal/main/*: process, require, internalBinding, primordials
356+
} else if (strncmp(id, "internal/main/", strlen("internal/main/")) == 0 ||
357+
strncmp(id,
358+
"internal/bootstrap/",
359+
strlen("internal/bootstrap/")) == 0) {
360+
// internal/main/*, internal/bootstrap/*: process, require,
361+
// internalBinding, primordials
357362
parameters = {
358363
FIXED_ONE_BYTE_STRING(isolate, "process"),
359364
FIXED_ONE_BYTE_STRING(isolate, "require"),
@@ -366,16 +371,6 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompile(
366371
FIXED_ONE_BYTE_STRING(isolate, "process"),
367372
FIXED_ONE_BYTE_STRING(isolate, "require"),
368373
};
369-
} else if (strncmp(id,
370-
"internal/bootstrap/",
371-
strlen("internal/bootstrap/")) == 0) {
372-
// internal/bootstrap/*: process, require, internalBinding, primordials
373-
parameters = {
374-
FIXED_ONE_BYTE_STRING(isolate, "process"),
375-
FIXED_ONE_BYTE_STRING(isolate, "require"),
376-
FIXED_ONE_BYTE_STRING(isolate, "internalBinding"),
377-
FIXED_ONE_BYTE_STRING(isolate, "primordials"),
378-
};
379374
} else {
380375
// others: exports, require, module, process, internalBinding, primordials
381376
parameters = {
@@ -396,6 +391,76 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompile(
396391
return maybe;
397392
}
398393

394+
MaybeLocal<Value> BuiltinLoader::CompileAndCall(Local<Context> context,
395+
const char* id,
396+
Realm* realm) {
397+
Isolate* isolate = context->GetIsolate();
398+
// Arguments must match the parameters specified in
399+
// BuiltinLoader::LookupAndCompile().
400+
std::vector<Local<Value>> arguments;
401+
// Detects parameters of the scripts based on module ids.
402+
// internal/bootstrap/loaders: process, getLinkedBinding,
403+
// getInternalBinding, primordials
404+
if (strcmp(id, "internal/bootstrap/loaders") == 0) {
405+
Local<Value> get_linked_binding;
406+
Local<Value> get_internal_binding;
407+
if (!NewFunctionTemplate(isolate, binding::GetLinkedBinding)
408+
->GetFunction(context)
409+
.ToLocal(&get_linked_binding) ||
410+
!NewFunctionTemplate(isolate, binding::GetInternalBinding)
411+
->GetFunction(context)
412+
.ToLocal(&get_internal_binding)) {
413+
return MaybeLocal<Value>();
414+
}
415+
arguments = {realm->process_object(),
416+
get_linked_binding,
417+
get_internal_binding,
418+
realm->primordials()};
419+
} else if (strncmp(id, "internal/main/", strlen("internal/main/")) == 0 ||
420+
strncmp(id,
421+
"internal/bootstrap/",
422+
strlen("internal/bootstrap/")) == 0) {
423+
// internal/main/*, internal/bootstrap/*: process, require,
424+
// internalBinding, primordials
425+
arguments = {realm->process_object(),
426+
realm->builtin_module_require(),
427+
realm->internal_binding_loader(),
428+
realm->primordials()};
429+
} else if (strncmp(id, "embedder_main_", strlen("embedder_main_")) == 0) {
430+
// Synthetic embedder main scripts from LoadEnvironment(): process, require
431+
arguments = {
432+
realm->process_object(),
433+
realm->builtin_module_require(),
434+
};
435+
} else {
436+
// This should be invoked with the other CompileAndCall() methods, as
437+
// we are unable to generate the arguments.
438+
// Currently there are two cases:
439+
// internal/per_context/*: the arguments are generated in
440+
// InitializePrimordials()
441+
// all the other cases: the arguments are generated in the JS-land loader.
442+
UNREACHABLE();
443+
}
444+
return CompileAndCall(
445+
context, id, arguments.size(), arguments.data(), realm->env());
446+
}
447+
448+
MaybeLocal<Value> BuiltinLoader::CompileAndCall(Local<Context> context,
449+
const char* id,
450+
int argc,
451+
Local<Value> argv[],
452+
Environment* optional_env) {
453+
// Arguments must match the parameters specified in
454+
// BuiltinLoader::LookupAndCompile().
455+
MaybeLocal<Function> maybe_fn = LookupAndCompile(context, id, optional_env);
456+
Local<Function> fn;
457+
if (!maybe_fn.ToLocal(&fn)) {
458+
return MaybeLocal<Value>();
459+
}
460+
Local<Value> undefined = Undefined(context->GetIsolate());
461+
return fn->Call(context, undefined, argc, argv);
462+
}
463+
399464
bool BuiltinLoader::CompileAllBuiltins(Local<Context> context) {
400465
BuiltinLoader* loader = GetInstance();
401466
std::vector<std::string> ids = loader->GetBuiltinIds();

‎src/node_builtins.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ class PerProcessTest;
1818
namespace node {
1919
class SnapshotBuilder;
2020
class ExternalReferenceRegistry;
21+
class Realm;
22+
2123
namespace builtins {
2224

2325
using BuiltinSourceMap = std::map<std::string, UnionBytes>;
@@ -50,6 +52,16 @@ class NODE_EXTERN_PRIVATE BuiltinLoader {
5052
const char* id,
5153
Environment* optional_env);
5254

55+
static v8::MaybeLocal<v8::Value> CompileAndCall(
56+
v8::Local<v8::Context> context,
57+
const char* id,
58+
int argc,
59+
v8::Local<v8::Value> argv[],
60+
Environment* optional_env);
61+
62+
static v8::MaybeLocal<v8::Value> CompileAndCall(
63+
v8::Local<v8::Context> context, const char* id, Realm* realm);
64+
5365
static v8::Local<v8::Object> GetSourceObject(v8::Local<v8::Context> context);
5466
// Returns config.gypi as a JSON string
5567
static v8::Local<v8::String> GetConfigString(v8::Isolate* isolate);

‎src/node_realm.cc‎

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -148,20 +148,10 @@ void Realm::DeserializeProperties(const RealmSerializeInfo* info) {
148148
DoneBootstrapping();
149149
}
150150

151-
MaybeLocal<Value> Realm::ExecuteBootstrapper(
152-
const char* id, std::vector<Local<Value>>* arguments) {
151+
MaybeLocal<Value> Realm::ExecuteBootstrapper(const char* id) {
153152
EscapableHandleScope scope(isolate());
154153
Local<Context> ctx = context();
155-
MaybeLocal<Function> maybe_fn =
156-
BuiltinLoader::LookupAndCompile(ctx, id, env());
157-
158-
Local<Function> fn;
159-
if (!maybe_fn.ToLocal(&fn)) {
160-
return MaybeLocal<Value>();
161-
}
162-
163-
MaybeLocal<Value> result =
164-
fn->Call(ctx, Undefined(isolate()), arguments->size(), arguments->data());
154+
MaybeLocal<Value> result = BuiltinLoader::CompileAndCall(ctx, id, this);
165155

166156
// If there was an error during bootstrap, it must be unrecoverable
167157
// (e.g. max call stack exceeded). Clear the stack so that the
@@ -179,21 +169,9 @@ MaybeLocal<Value> Realm::ExecuteBootstrapper(
179169
MaybeLocal<Value> Realm::BootstrapInternalLoaders() {
180170
EscapableHandleScope scope(isolate_);
181171

182-
// Arguments must match the parameters specified in
183-
// BuiltinLoader::LookupAndCompile().
184-
std::vector<Local<Value>> loaders_args = {
185-
process_object(),
186-
NewFunctionTemplate(isolate_, binding::GetLinkedBinding)
187-
->GetFunction(context())
188-
.ToLocalChecked(),
189-
NewFunctionTemplate(isolate_, binding::GetInternalBinding)
190-
->GetFunction(context())
191-
.ToLocalChecked(),
192-
primordials()};
193-
194172
// Bootstrap internal loaders
195173
Local<Value> loader_exports;
196-
if (!ExecuteBootstrapper("internal/bootstrap/loaders", &loaders_args)
174+
if (!ExecuteBootstrapper("internal/bootstrap/loaders")
197175
.ToLocal(&loader_exports)) {
198176
return MaybeLocal<Value>();
199177
}
@@ -216,23 +194,14 @@ MaybeLocal<Value> Realm::BootstrapInternalLoaders() {
216194
MaybeLocal<Value> Realm::BootstrapNode() {
217195
EscapableHandleScope scope(isolate_);
218196

219-
// Arguments must match the parameters specified in
220-
// BuiltinLoader::LookupAndCompile().
221-
// process, require, internalBinding, primordials
222-
std::vector<Local<Value>> node_args = {process_object(),
223-
builtin_module_require(),
224-
internal_binding_loader(),
225-
primordials()};
226-
227-
MaybeLocal<Value> result =
228-
ExecuteBootstrapper("internal/bootstrap/node", &node_args);
197+
MaybeLocal<Value> result = ExecuteBootstrapper("internal/bootstrap/node");
229198

230199
if (result.IsEmpty()) {
231200
return MaybeLocal<Value>();
232201
}
233202

234203
if (!env_->no_browser_globals()) {
235-
result = ExecuteBootstrapper("internal/bootstrap/browser", &node_args);
204+
result = ExecuteBootstrapper("internal/bootstrap/browser");
236205

237206
if (result.IsEmpty()) {
238207
return MaybeLocal<Value>();
@@ -243,7 +212,7 @@ MaybeLocal<Value> Realm::BootstrapNode() {
243212
auto thread_switch_id =
244213
env_->is_main_thread() ? "internal/bootstrap/switches/is_main_thread"
245214
: "internal/bootstrap/switches/is_not_main_thread";
246-
result = ExecuteBootstrapper(thread_switch_id, &node_args);
215+
result = ExecuteBootstrapper(thread_switch_id);
247216

248217
if (result.IsEmpty()) {
249218
return MaybeLocal<Value>();
@@ -253,7 +222,7 @@ MaybeLocal<Value> Realm::BootstrapNode() {
253222
env_->owns_process_state()
254223
? "internal/bootstrap/switches/does_own_process_state"
255224
: "internal/bootstrap/switches/does_not_own_process_state";
256-
result = ExecuteBootstrapper(process_state_switch_id, &node_args);
225+
result = ExecuteBootstrapper(process_state_switch_id);
257226

258227
if (result.IsEmpty()) {
259228
return MaybeLocal<Value>();

‎src/node_realm.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ class Realm : public MemoryRetainer {
6060
RealmSerializeInfo Serialize(v8::SnapshotCreator* creator);
6161
void DeserializeProperties(const RealmSerializeInfo* info);
6262

63-
v8::MaybeLocal<v8::Value> ExecuteBootstrapper(
64-
const char* id, std::vector<v8::Local<v8::Value>>* arguments);
63+
v8::MaybeLocal<v8::Value> ExecuteBootstrapper(const char* id);
6564
v8::MaybeLocal<v8::Value> BootstrapInternalLoaders();
6665
v8::MaybeLocal<v8::Value> BootstrapNode();
6766
v8::MaybeLocal<v8::Value> RunBootstrapping();

0 commit comments

Comments
 (0)