From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Thu, 13 Oct 2022 17:10:01 +0200 Subject: fix: expose LookupAndCompile with parameters Node.js removed custom parameters from the public version of LookupAndCompile, which we use in Electron. This patch re-exposes a wrapper to allow custom parameters. This should be upstreamed. diff --git a/src/node_builtins.cc b/src/node_builtins.cc index 3bc9d113b6b818dcda332966f09f17248b421263..549339b5b677fa242a7b60ae716789c2a11ab18d 100644 --- a/src/node_builtins.cc +++ b/src/node_builtins.cc @@ -397,6 +397,22 @@ MaybeLocal BuiltinLoader::LookupAndCompile( return maybe; } +MaybeLocal BuiltinLoader::LookupAndCompile( + Local context, + const char* id, + std::vector>* parameters, + Environment* optional_env) { + Result result; + Isolate* isolate = context->GetIsolate(); + + MaybeLocal maybe = GetInstance()->LookupAndCompileInternal( + context, id, parameters, &result); + if (optional_env != nullptr) { + RecordResult(id, result, optional_env); + } + return maybe; +} + bool BuiltinLoader::CompileAllBuiltins(Local context) { BuiltinLoader* loader = GetInstance(); std::vector ids = loader->GetBuiltinIds(); diff --git a/src/node_builtins.h b/src/node_builtins.h index 7f0a25af306ffefbc51ac43689ed208d4cd94f0b..a32a7a990082ea3dad73511f91a9c70c72f6fe31 100644 --- a/src/node_builtins.h +++ b/src/node_builtins.h @@ -49,6 +49,11 @@ class NODE_EXTERN_PRIVATE BuiltinLoader { v8::Local context, const char* id, Environment* optional_env); + static v8::MaybeLocal LookupAndCompile( + v8::Local context, + const char* id, + std::vector>* parameters, + Environment* optional_env); static v8::Local GetSourceObject(v8::Local context); // Returns config.gypi as a JSON string