src: create per isolate proxy env template

PR-URL: #48655 Backport-PR-URL: #51239 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Joyee Cheung <[email protected]>
nodejs · Dec 20, 2023 · 23a86e5 · 23a86e5
1 parent 6b9892b
commit 23a86e5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/env.cc b/src/env.cc
@@ -504,6 +504,7 @@ void IsolateData::CreateProperties() {
  binding::CreateInternalBindingTemplates(this);
 
  contextify::ContextifyContext::InitializeGlobalTemplates(this);
+ CreateEnvProxyTemplate(this);
 }
 
 constexpr uint16_t kDefaultCppGCEmebdderID = 0x90de;

diff --git a/src/node_env_var.cc b/src/node_env_var.cc
@@ -456,7 +456,8 @@ static void EnvDefiner(Local<Name> property,
  }
 }
 
-void CreateEnvProxyTemplate(Isolate* isolate, IsolateData* isolate_data) {
+void CreateEnvProxyTemplate(IsolateData* isolate_data) {
+ Isolate* isolate = isolate_data->isolate();
  HandleScope scope(isolate);
  if (!isolate_data->env_proxy_template().IsEmpty()) return;
  Local<FunctionTemplate> env_proxy_ctor_template =

diff --git a/src/node_process.h b/src/node_process.h
@@ -15,7 +15,7 @@ class MemoryTracker;
 class ExternalReferenceRegistry;
 class Realm;
 
-void CreateEnvProxyTemplate(v8::Isolate* isolate, IsolateData* isolate_data);
+void CreateEnvProxyTemplate(IsolateData* isolate_data);
 
 // Most of the time, it's best to use `console.error` to write
 // to the process.stderr stream. However, in some cases, such as

diff --git a/src/node_realm.cc b/src/node_realm.cc
@@ -344,10 +344,11 @@ MaybeLocal<Value> PrincipalRealm::BootstrapRealm() {
  return MaybeLocal<Value>();
  }
 
+ // Setup process.env proxy.
  Local<String> env_string = FIXED_ONE_BYTE_STRING(isolate_, "env");
  Local<Object> env_proxy;
- CreateEnvProxyTemplate(isolate_, env_->isolate_data());
- if (!env_->env_proxy_template()->NewInstance(context()).ToLocal(&env_proxy) ||
+ if (!isolate_data()->env_proxy_template()->NewInstance(context()).ToLocal(
+  &env_proxy) ||
  process_object()->Set(context(), env_string, env_proxy).IsNothing()) {
  return MaybeLocal<Value>();
  }