Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/api/environment.cc
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ Maybe<void> InitializeMainContextForSnapshot(Local<Context> context) {
if (InitializeBaseContextForSnapshot(context).IsNothing()) {
return Nothing<void>();
}
return InitializePrimordials(context);
return JustVoid();
}

Maybe<void> InitializePrimordials(Local<Context> context) {
Expand All @@ -767,13 +767,18 @@ Maybe<void> InitializePrimordials(Local<Context> context) {
Context::Scope context_scope(context);
Local<Object> exports;

if (!GetPerContextExports(context).ToLocal(&exports)) {
return Nothing<void>();
}
Local<String> primordials_string =
FIXED_ONE_BYTE_STRING(isolate, "primordials");
// Ensure that `InitializePrimordials` is called exactly once on a given
// context.
CHECK(!exports->Has(context, primordials_string).FromJust());

// Create primordials first and make it available to per-context scripts.
Local<Object> primordials = Object::New(isolate);
// Create primordials and make it available to per-context scripts.
if (primordials->SetPrototypeV2(context, Null(isolate)).IsNothing() ||
!GetPerContextExports(context).ToLocal(&exports) ||
exports->Set(context, primordials_string, primordials).IsNothing()) {
return Nothing<void>();
}
Expand Down
Loading