src: use CreateEnvironment instead of inlining its code where possible

src/api/environment.cc

@@ -375,23 +375,33 @@ Environment* CreateEnvironment(
   // options than the global parse call.
   Environment* env = new Environment(
       isolate_data, context, args, exec_args, nullptr, flags, thread_id);
+
+  auto initialize_inspector = [&]() {
 #if HAVE_INSPECTOR
-  if (env->should_create_inspector()) {
-    if (inspector_parent_handle) {
-      env->InitializeInspector(
-          std::move(static_cast<InspectorParentHandleImpl*>(
-              inspector_parent_handle.get())->impl));
-    } else {
-      env->InitializeInspector({});
+    if (env->should_create_inspector()) {
+      if (inspector_parent_handle) {
+        env->InitializeInspector(
+            std::move(static_cast<InspectorParentHandleImpl*>(
+                          inspector_parent_handle.get())
+                          ->impl));
+      } else {
+        env->InitializeInspector({});
+      }
     }
-  }
 #endif
+  };
+
+  if (!(flags & EnvironmentFlags::kInspectorOnlyAfterBootstrap))
+    initialize_inspector();
 
   if (env->principal_realm()->RunBootstrapping().IsEmpty()) {
     FreeEnvironment(env);
     return nullptr;
   }
 
+  if (flags & EnvironmentFlags::kInspectorOnlyAfterBootstrap)
+    initialize_inspector();
+
   return env;
 }
 

src/node.h

@@ -560,7 +560,10 @@ enum Flags : uint64_t {
   // This control is needed by embedders who may not want to initialize the V8
   // inspector in situations where one has already been created,
   // e.g. Blink's in Chromium.
-  kNoCreateInspector = 1 << 9
+  kNoCreateInspector = 1 << 9,
+  // Whether to enable the V8 inspector during Node.js bootstrap or not.
+  // This has no effect if kNoCreateInspector is set.
+  kInspectorOnlyAfterBootstrap = 1 << 10
 };
 }  // namespace EnvironmentFlags
 

src/node_main_instance.cc

@@ -191,19 +191,8 @@ NodeMainInstance::CreateMainEnvironment(ExitCode* exit_code) {
     context = NewContext(isolate_);
     CHECK(!context.IsEmpty());
     Context::Scope context_scope(context);
-    env.reset(new Environment(isolate_data_.get(),
-                              context,
-                              args_,
-                              exec_args_,
-                              nullptr,
-                              EnvironmentFlags::kDefaultFlags,
-                              {}));
-#if HAVE_INSPECTOR
-    env->InitializeInspector({});
-#endif
-    if (env->principal_realm()->RunBootstrapping().IsEmpty()) {
-      return nullptr;
-    }
+    env.reset(
+        CreateEnvironment(isolate_data_.get(), context, args_, exec_args_));
   }
 
   return env;

src/node_snapshotable.cc

@@ -1151,16 +1151,20 @@ ExitCode SnapshotBuilder::Generate(SnapshotData* out,
       Context::Scope context_scope(main_context);
 
       // Create the environment.
-      env = new Environment(main_instance->isolate_data(),
-                            main_context,
-                            args,
-                            exec_args,
-                            nullptr,
-                            node::EnvironmentFlags::kDefaultFlags,
-                            {});
-
-      // Run scripts in lib/internal/bootstrap/
-      if (env->principal_realm()->RunBootstrapping().IsEmpty()) {
+      uint64_t env_flags = EnvironmentFlags::kDefaultFlags |
+                           EnvironmentFlags::kInspectorOnlyAfterBootstrap;
+      if (snapshot_type != SnapshotMetadata::Type::kFullyCustomized) {
+        env_flags |= EnvironmentFlags::kNoCreateInspector;
+      }
+
+      env = CreateEnvironment(main_instance->isolate_data(),
+                              main_context,
+                              args,
+                              exec_args,
+                              static_cast<EnvironmentFlags::Flags>(env_flags));
+
+      // This already ran scripts in lib/internal/bootstrap/, if it fails return
+      if (env == nullptr) {
         return ExitCode::kBootstrapFailure;
       }
       // If --build-snapshot is true, lib/internal/main/mksnapshot.js would be
@@ -1169,9 +1173,6 @@ ExitCode SnapshotBuilder::Generate(SnapshotData* out,
       // could also explore snapshotting other kinds of execution modes
       // in the future).
       if (snapshot_type == SnapshotMetadata::Type::kFullyCustomized) {
-#if HAVE_INSPECTOR
-        env->InitializeInspector({});
-#endif
         if (LoadEnvironment(env, StartExecutionCallback{}).IsEmpty()) {
           return ExitCode::kGenericUserError;
         }