From 0918ea068340487d9ecfd5f34ec3df0e55c86ab8 Mon Sep 17 00:00:00 2001
From: Darshan Sen <darshan.sen@postman.com>
Date: Sun, 15 Aug 2021 11:00:35 +0530
Subject: [PATCH] src: add a constructor overload for CallbackScope

This overload accepts the current Environment* as an argument, unlike
the other constructor, which accepts an Isolate*. This is useful because
we can pass the current Environment* directly instead of recomputing it
from the Isolate* inside the constructor.

Signed-off-by: Darshan Sen <darshan.sen@postman.com>

PR-URL: https://github.com/nodejs/node/pull/39768
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
---
 src/api/async_resource.cc |  4 +---
 src/api/callback.cc       | 10 ++++++++++
 src/node.h                |  3 +++
 src/node_api.cc           |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/api/async_resource.cc b/src/api/async_resource.cc
index 0a2437fe6eda5c..3c4fbdadbc462c 100644
--- a/src/api/async_resource.cc
+++ b/src/api/async_resource.cc
@@ -62,10 +62,8 @@ async_id AsyncResource::get_trigger_async_id() const {
   return async_context_.trigger_async_id;
 }
 
-// TODO(addaleax): We shouldn’t need to use env_->isolate() if we’re just going
-// to end up using the Isolate* to figure out the Environment* again.
 AsyncResource::CallbackScope::CallbackScope(AsyncResource* res)
-    : node::CallbackScope(res->env_->isolate(),
+    : node::CallbackScope(res->env_,
                           res->resource_.Get(res->env_->isolate()),
                           res->async_context_) {}
 
diff --git a/src/api/callback.cc b/src/api/callback.cc
index 911b1160eba342..8f9d617d1eaf3f 100644
--- a/src/api/callback.cc
+++ b/src/api/callback.cc
@@ -26,6 +26,16 @@ CallbackScope::CallbackScope(Isolate* isolate,
   try_catch_.SetVerbose(true);
 }
 
+CallbackScope::CallbackScope(Environment* env,
+                             Local<Object> object,
+                             async_context asyncContext)
+  : private_(new InternalCallbackScope(env,
+                                       object,
+                                       asyncContext)),
+    try_catch_(env->isolate()) {
+  try_catch_.SetVerbose(true);
+}
+
 CallbackScope::~CallbackScope() {
   if (try_catch_.HasCaught())
     private_->MarkAsFailed();
diff --git a/src/node.h b/src/node.h
index 676d1d5fbad74e..049163bf27cc7c 100644
--- a/src/node.h
+++ b/src/node.h
@@ -1008,6 +1008,9 @@ class NODE_EXTERN CallbackScope {
   CallbackScope(v8::Isolate* isolate,
                 v8::Local<v8::Object> resource,
                 async_context asyncContext);
+  CallbackScope(Environment* env,
+                v8::Local<v8::Object> resource,
+                async_context asyncContext);
   ~CallbackScope();
 
   void operator=(const CallbackScope&) = delete;
diff --git a/src/node_api.cc b/src/node_api.cc
index 8304ccb7e86a08..b1b85073508672 100644
--- a/src/node_api.cc
+++ b/src/node_api.cc
@@ -539,7 +539,7 @@ class AsyncContext {
   class CallbackScope : public node::CallbackScope {
    public:
     explicit CallbackScope(AsyncContext* async_context)
-        : node::CallbackScope(async_context->node_env()->isolate(),
+        : node::CallbackScope(async_context->node_env(),
                               async_context->resource_.Get(
                                   async_context->node_env()->isolate()),
                               async_context->async_context()) {}