src: reduce code duplication in BootstrapNode

PR-URL: #31465 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: David Carlier <[email protected]> Reviewed-By: Yongsheng Zhang <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Mar 17, 2020 · ce6b9d1 · ce6b9d1
1 parent e3e056d
commit ce6b9d1
Showing 1 changed file with 13 additions and 29 deletions.
diff --git a/src/node.cc b/src/node.cc
@@ -306,48 +306,32 @@ MaybeLocal<Value> Environment::BootstrapNode() {
     return scope.EscapeMaybe(result);
   }
 
-  if (is_main_thread()) {
-    result = ExecuteBootstrapper(this,
-                                 "internal/bootstrap/switches/is_main_thread",
-                                 &node_params,
-                                 &node_args);
-  } else {
-    result =
-        ExecuteBootstrapper(this,
-                            "internal/bootstrap/switches/is_not_main_thread",
-                            &node_params,
-                            &node_args);
-  }
+  auto thread_switch_id =
+      is_main_thread() ? "internal/bootstrap/switches/is_main_thread"
+                       : "internal/bootstrap/switches/is_not_main_thread";
+  result =
+      ExecuteBootstrapper(this, thread_switch_id, &node_params, &node_args);
 
   if (result.IsEmpty()) {
     return scope.EscapeMaybe(result);
   }
 
-  if (owns_process_state()) {
-    result = ExecuteBootstrapper(
-        this,
-        "internal/bootstrap/switches/does_own_process_state",
-        &node_params,
-        &node_args);
-  } else {
-    result = ExecuteBootstrapper(
-        this,
-        "internal/bootstrap/switches/does_not_own_process_state",
-        &node_params,
-        &node_args);
-  }
+  auto process_state_switch_id =
+      owns_process_state()
+          ? "internal/bootstrap/switches/does_own_process_state"
+          : "internal/bootstrap/switches/does_not_own_process_state";
+  result = ExecuteBootstrapper(
+      this, process_state_switch_id, &node_params, &node_args);
 
   if (result.IsEmpty()) {
     return scope.EscapeMaybe(result);
   }
 
+  Local<String> env_string = FIXED_ONE_BYTE_STRING(isolate_, "env");
   Local<Object> env_var_proxy;
   if (!CreateEnvVarProxy(context(), isolate_, as_callback_data())
            .ToLocal(&env_var_proxy) ||
-      process_object()
-          ->Set(
-              context(), FIXED_ONE_BYTE_STRING(isolate_, "env"), env_var_proxy)
-          .IsNothing()) {
+      process_object()->Set(context(), env_string, env_var_proxy).IsNothing()) {
     return MaybeLocal<Value>();
   }