diff --git a/src/api/environment.cc b/src/api/environment.cc index a18c21fa797422..ea2be2c5c0bad6 100644 --- a/src/api/environment.cc +++ b/src/api/environment.cc @@ -42,6 +42,7 @@ static bool ShouldAbortOnUncaughtException(Isolate* isolate) { Environment* env = Environment::GetCurrent(isolate); return env != nullptr && (env->is_main_thread() || !env->is_stopping()) && + env->abort_on_uncaught_exception() && env->should_abort_on_uncaught_toggle()[0] && !env->inside_should_not_abort_on_uncaught_scope(); } @@ -355,9 +356,6 @@ Environment* CreateEnvironment( exec_args, flags, thread_id); - if (flags & EnvironmentFlags::kOwnsProcessState) { - env->set_abort_on_uncaught_exception(false); - } #if HAVE_INSPECTOR if (inspector_parent_handle) { diff --git a/src/env.cc b/src/env.cc index 331712f1c9db71..6a70bcdca4ae1c 100644 --- a/src/env.cc +++ b/src/env.cc @@ -348,6 +348,10 @@ Environment::Environment(IsolateData* isolate_data, inspector_host_port_.reset( new ExclusiveAccess(options_->debug_options().host_port)); + if (!(flags_ & EnvironmentFlags::kOwnsProcessState)) { + set_abort_on_uncaught_exception(false); + } + #if HAVE_INSPECTOR // We can only create the inspector agent after having cloned the options. inspector_agent_ = std::make_unique(this); diff --git a/test/parallel/test-worker-abort-on-uncaught-exception.js b/test/parallel/test-worker-abort-on-uncaught-exception.js new file mode 100644 index 00000000000000..7518d37552f24b --- /dev/null +++ b/test/parallel/test-worker-abort-on-uncaught-exception.js @@ -0,0 +1,12 @@ +// Flags: --abort-on-uncaught-exception +'use strict'; +const common = require('../common'); +const assert = require('assert'); +const { Worker } = require('worker_threads'); + +// Tests that --abort-on-uncaught-exception does not apply to +// Workers. + +const w = new Worker('throw new Error()', { eval: true }); +w.on('error', common.mustCall()); +w.on('exit', common.mustCall((code) => assert.strictEqual(code, 1)));