@@ -501,7 +501,7 @@ MaybeLocal<Object> GetPerContextExports(Local<Context> context) {
501
501
502
502
Local<Object> exports = Object::New (isolate);
503
503
if (context->Global ()->SetPrivate (context, key, exports).IsNothing () ||
504
- ! InitializePrimordials (context))
504
+ InitializePrimordials (context). IsEmpty ( ))
505
505
return MaybeLocal<Object>();
506
506
return handle_scope.Escape (exports);
507
507
}
@@ -587,10 +587,10 @@ bool InitializeContextForSnapshot(Local<Context> context) {
587
587
588
588
context->SetEmbedderData (ContextEmbedderIndex::kAllowWasmCodeGeneration ,
589
589
True (isolate));
590
- return InitializePrimordials (context);
590
+ return ! InitializePrimordials (context). IsEmpty ( );
591
591
}
592
592
593
- bool InitializePrimordials (Local<Context> context) {
593
+ MaybeLocal<Object> InitializePrimordials (Local<Context> context) {
594
594
// Run per-context JS files.
595
595
Isolate* isolate = context->GetIsolate ();
596
596
Context::Scope context_scope (context);
@@ -606,7 +606,7 @@ bool InitializePrimordials(Local<Context> context) {
606
606
if (!primordials->SetPrototype (context, Null (isolate)).FromJust () ||
607
607
!GetPerContextExports (context).ToLocal (&exports) ||
608
608
!exports->Set (context, primordials_string, primordials).FromJust ()) {
609
- return false ;
609
+ return MaybeLocal<Object>() ;
610
610
}
611
611
612
612
static const char * context_files[] = {" internal/per_context/primordials" ,
@@ -623,18 +623,17 @@ bool InitializePrimordials(Local<Context> context) {
623
623
context, *module, ¶meters, nullptr );
624
624
Local<Function> fn;
625
625
if (!maybe_fn.ToLocal (&fn)) {
626
- return false ;
626
+ return MaybeLocal<Object>() ;
627
627
}
628
628
MaybeLocal<Value> result =
629
629
fn->Call (context, Undefined (isolate), arraysize (arguments), arguments);
630
630
// Execution failed during context creation.
631
- // TODO(joyeecheung): deprecate this signature and return a MaybeLocal.
632
631
if (result.IsEmpty ()) {
633
- return false ;
632
+ return MaybeLocal<Object>() ;
634
633
}
635
634
}
636
635
637
- return true ;
636
+ return primordials ;
638
637
}
639
638
640
639
bool InitializeContext (Local<Context> context) {
0 commit comments