src: return MaybeLocal from InitializePrimordials

Signed-off-by: Darshan Sen <darshan.sen@postman.com>
nodejs · Jul 31, 2021 · a77d745 · a77d745
1 parent 8be3b91
commit a77d745
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/api/environment.cc b/src/api/environment.cc
@@ -501,7 +501,7 @@ MaybeLocal<Object> GetPerContextExports(Local<Context> context) {
 
   Local<Object> exports = Object::New(isolate);
   if (context->Global()->SetPrivate(context, key, exports).IsNothing() ||
-      !InitializePrimordials(context))
+      InitializePrimordials(context).IsEmpty())
     return MaybeLocal<Object>();
   return handle_scope.Escape(exports);
 }
@@ -587,10 +587,10 @@ bool InitializeContextForSnapshot(Local<Context> context) {
 
   context->SetEmbedderData(ContextEmbedderIndex::kAllowWasmCodeGeneration,
                            True(isolate));
-  return InitializePrimordials(context);
+  return !InitializePrimordials(context).IsEmpty();
 }
 
-bool InitializePrimordials(Local<Context> context) {
+MaybeLocal<Object> InitializePrimordials(Local<Context> context) {
   // Run per-context JS files.
   Isolate* isolate = context->GetIsolate();
   Context::Scope context_scope(context);
@@ -606,7 +606,7 @@ bool InitializePrimordials(Local<Context> context) {
   if (!primordials->SetPrototype(context, Null(isolate)).FromJust() ||
       !GetPerContextExports(context).ToLocal(&exports) ||
       !exports->Set(context, primordials_string, primordials).FromJust()) {
-    return false;
+    return MaybeLocal<Object>();
   }
 
   static const char* context_files[] = {"internal/per_context/primordials",
@@ -623,18 +623,17 @@ bool InitializePrimordials(Local<Context> context) {
             context, *module, &parameters, nullptr);
     Local<Function> fn;
     if (!maybe_fn.ToLocal(&fn)) {
-      return false;
+      return MaybeLocal<Object>();
     }
     MaybeLocal<Value> result =
         fn->Call(context, Undefined(isolate), arraysize(arguments), arguments);
     // Execution failed during context creation.
-    // TODO(joyeecheung): deprecate this signature and return a MaybeLocal.
     if (result.IsEmpty()) {
-      return false;
+      return MaybeLocal<Object>();
     }
   }
 
-  return true;
+  return primordials;
 }
 
 bool InitializeContext(Local<Context> context) {

diff --git a/src/node_internals.h b/src/node_internals.h
@@ -92,8 +92,9 @@ void SignalExit(int signal, siginfo_t* info, void* ucontext);
 std::string GetProcessTitle(const char* default_title);
 std::string GetHumanReadableProcessName();
 
-void InitializeContextRuntime(v8::Local<v8::Context>);
-bool InitializePrimordials(v8::Local<v8::Context> context);
+void InitializeContextRuntime(v8::Local<v8::Context> context);
+v8::MaybeLocal<v8::Object> InitializePrimordials(
+    v8::Local<v8::Context> context);
 
 class NodeArrayBufferAllocator : public ArrayBufferAllocator {
  public: