From 4d6b35330ed100204d14b8547827da4def2956aa Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Tue, 11 Aug 2020 13:12:10 +0200 Subject: [PATCH] worker: fix --abort-on-uncaught-exception handling The `set_abort_on_uncaught_exception(false)` line was supposed to prevent aborting when running Workers in `--abort-on-uncaught-exception` mode, but it was incorrectly set and not checked properly in the should-abort callback. --- src/api/environment.cc | 1 + src/env.cc | 2 +- .../test-worker-abort-on-uncaught-exception.js | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 test/parallel/test-worker-abort-on-uncaught-exception.js diff --git a/src/api/environment.cc b/src/api/environment.cc index 8e5caac20bd3a6..a99201e76218cd 100644 --- a/src/api/environment.cc +++ b/src/api/environment.cc @@ -43,6 +43,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(); } diff --git a/src/env.cc b/src/env.cc index eb0fb2992502b9..58681cdcccc12d 100644 --- a/src/env.cc +++ b/src/env.cc @@ -359,7 +359,7 @@ Environment::Environment(IsolateData* isolate_data, inspector_host_port_.reset( new ExclusiveAccess(options_->debug_options().host_port)); - if (flags & EnvironmentFlags::kOwnsProcessState) { + if (!(flags_ & EnvironmentFlags::kOwnsProcessState)) { set_abort_on_uncaught_exception(false); } 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)));