nodejs
diff --git a/Collapse file
‎src/api/environment.cc‎
Copy file name to clipboardExpand all lines: src/api/environment.cc
+3-1Lines changed: 3 additions & 1 deletion b/Collapse file
‎src/api/environment.cc‎
Copy file name to clipboardExpand all lines: src/api/environment.cc
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/Collapse file
‎test/abort/test-worker-abort-uncaught-exception.js‎
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions b/Collapse file
‎test/abort/test-worker-abort-uncaught-exception.js‎
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
diff --git a/Collapse file
‎test/parallel/test-worker-abort-on-uncaught-exception-terminate.js‎
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions b/Collapse file
‎test/parallel/test-worker-abort-on-uncaught-exception-terminate.js‎
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions
@@ -32,7 +32,9 @@ static bool AllowWasmCodeGenerationCallback(Local<Context> context,
 static bool ShouldAbortOnUncaughtException(Isolate* isolate) {
   HandleScope scope(isolate);
   Environment* env = Environment::GetCurrent(isolate);
-  return env != nullptr && env->should_abort_on_uncaught_toggle()[0] &&
+  return env != nullptr &&
+         (env->is_main_thread() || !env->is_stopping_worker()) &&
+         env->should_abort_on_uncaught_toggle()[0] &&
          !env->inside_should_not_abort_on_uncaught_scope();
 }
 
 
@@ -0,0 +1,24 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const { spawn } = require('child_process');
+const { Worker } = require('worker_threads');
+
+// Tests that --abort-on-uncaught-exception applies to workers as well.
+
+if (process.argv[2] === 'child') {
+  new Worker('throw new Error("foo");', { eval: true });
+  return;
+}
+
+const child = spawn(process.execPath, [
+  '--abort-on-uncaught-exception', __filename, 'child'
+]);
+child.on('exit', common.mustCall((code, sig) => {
+  if (common.isWindows) {
+    assert.strictEqual(code, 0xC0000005);
+  } else {
+    assert(['SIGABRT', 'SIGTRAP', 'SIGILL'].includes(sig),
+           `Unexpected signal ${sig}`);
+  }
+}));
@@ -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
+// termination exceptions.
+
+const w = new Worker('while(true);', { eval: true });
+w.on('online', common.mustCall(() => w.terminate()));
+w.on('exit', common.mustCall((code) => assert.strictEqual(code, 1)));