From 0e12a430938e9e86a90ae9cde60959d3b8fba08e Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Mon, 24 Feb 2020 19:14:15 -0800
Subject: [PATCH] src: move InternalCallbackScope to StartExecution

PR-URL: https://github.com/nodejs/node/pull/31944
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
---
 src/node.cc               | 6 ++++++
 src/node_main_instance.cc | 9 +--------
 src/node_worker.cc        | 5 -----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/node.cc b/src/node.cc
index fee485f86e17f1..0f4f39b1b5354b 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -390,6 +390,12 @@ MaybeLocal<Value> StartExecution(Environment* env, const char* main_script_id) {
           ->GetFunction(env->context())
           .ToLocalChecked()};
 
+  InternalCallbackScope callback_scope(
+    env,
+    Object::New(env->isolate()),
+    { 1, 0 },
+    InternalCallbackScope::kSkipAsyncHooks);
+
   return scope.EscapeMaybe(
       ExecuteBootstrapper(env, main_script_id, &parameters, &arguments));
 }
diff --git a/src/node_main_instance.cc b/src/node_main_instance.cc
index d53eaa7329beed..6f240d7e809f8e 100644
--- a/src/node_main_instance.cc
+++ b/src/node_main_instance.cc
@@ -122,14 +122,7 @@ int NodeMainInstance::Run() {
   Context::Scope context_scope(env->context());
 
   if (exit_code == 0) {
-    {
-      InternalCallbackScope callback_scope(
-          env.get(),
-          Object::New(isolate_),
-          { 1, 0 },
-          InternalCallbackScope::kSkipAsyncHooks);
-      LoadEnvironment(env.get());
-    }
+    LoadEnvironment(env.get());
 
     env->set_trace_sync_io(env->options()->trace_sync_io);
 
diff --git a/src/node_worker.cc b/src/node_worker.cc
index 8825b87bf24bc2..777559cedc00d2 100644
--- a/src/node_worker.cc
+++ b/src/node_worker.cc
@@ -343,11 +343,6 @@ void Worker::Run() {
         env_->InitializeInspector(std::move(inspector_parent_handle_));
 #endif
         HandleScope handle_scope(isolate_);
-        InternalCallbackScope callback_scope(
-            env_.get(),
-            Object::New(isolate_),
-            { 1, 0 },
-            InternalCallbackScope::kSkipAsyncHooks);
 
         if (!env_->RunBootstrapping().IsEmpty()) {
           CreateEnvMessagePort(env_.get());