diff --git a/src/api/environment.cc b/src/api/environment.cc index ad496a6621d10c..ee7732c93b8563 100644 --- a/src/api/environment.cc +++ b/src/api/environment.cc @@ -332,8 +332,7 @@ Environment* CreateEnvironment(IsolateData* isolate_data, context, args, exec_args, - static_cast(Environment::kIsMainThread | - Environment::kOwnsProcessState | + static_cast(Environment::kOwnsProcessState | Environment::kOwnsInspector)); env->InitializeLibuv(per_process::v8_is_profiling); if (env->RunBootstrapping().IsEmpty()) { diff --git a/src/env-inl.h b/src/env-inl.h index 93b71c3194fa56..b82ac88fc7fafc 100644 --- a/src/env-inl.h +++ b/src/env-inl.h @@ -854,7 +854,7 @@ inline void Environment::set_has_serialized_options(bool value) { } inline bool Environment::is_main_thread() const { - return flags_ & kIsMainThread; + return worker_context() == nullptr; } inline bool Environment::owns_process_state() const { diff --git a/src/env.h b/src/env.h index 72381c6cf4ad4e..5e9c7c0495366f 100644 --- a/src/env.h +++ b/src/env.h @@ -876,7 +876,6 @@ class Environment : public MemoryRetainer { enum Flags { kNoFlags = 0, - kIsMainThread = 1 << 0, kOwnsProcessState = 1 << 1, kOwnsInspector = 1 << 2, }; diff --git a/src/node_main_instance.cc b/src/node_main_instance.cc index c6533321bd6b64..cbbff1ad742006 100644 --- a/src/node_main_instance.cc +++ b/src/node_main_instance.cc @@ -204,8 +204,7 @@ NodeMainInstance::CreateMainEnvironment(int* exit_code) { context, args_, exec_args_, - static_cast(Environment::kIsMainThread | - Environment::kOwnsProcessState | + static_cast(Environment::kOwnsProcessState | Environment::kOwnsInspector)) }; env->InitializeLibuv(per_process::v8_is_profiling); env->InitializeDiagnostics();