nodejs
diff --git a/‎src/api/callback.cc‎
Lines changed: 7 additions & 3 deletions b/‎src/api/callback.cc‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎src/api/environment.cc‎
Lines changed: 1 addition & 0 deletions b/‎src/api/environment.cc‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎test/parallel/test-unhandled-exception-with-worker-inuse.js‎
Lines changed: 32 additions & 0 deletions b/‎test/parallel/test-unhandled-exception-with-worker-inuse.js‎
Lines changed: 32 additions & 0 deletions
diff --git a/test/sequential/test-worker-http2-stream-terminate.js renamed to test/parallel/test-worker-http2-stream-terminate.js b/test/sequential/test-worker-http2-stream-terminate.js renamed to test/parallel/test-worker-http2-stream-terminate.js
@@ -97,10 +97,9 @@ void InternalCallbackScope::Close() {
   if (closed_) return;
   closed_ = true;
 
-  Isolate* isolate = env_->isolate();
-  auto idle = OnScopeLeave([&]() { isolate->SetIdle(true); });
+  // This function must ends up with either cleanup the
+  // async id stack or pop the topmost one from it
 
-  if (!env_->can_call_into_js()) return;
   auto perform_stopping_check = [&]() {
     if (env_->is_stopping()) {
       MarkAsFailed();
@@ -109,6 +108,11 @@ void InternalCallbackScope::Close() {
   };
   perform_stopping_check();
 
+  if (env_->is_stopping()) return;
+
+  Isolate* isolate = env_->isolate();
+  auto idle = OnScopeLeave([&]() { isolate->SetIdle(true); });
+
   if (!failed_ && async_context_.async_id != 0 && !skip_hooks_) {
     AsyncWrap::EmitAfter(env_, async_context_.async_id);
   }
 
@@ -802,6 +802,7 @@ ThreadId AllocateEnvironmentThreadId() {
 }
 
 void DefaultProcessExitHandler(Environment* env, int exit_code) {
+  env->set_stopping(true);
   env->set_can_call_into_js(false);
   env->stop_sub_worker_contexts();
   env->isolate()->DumpAndResetStats();
 
@@ -0,0 +1,32 @@
+'use strict';
+const common = require('../common');
+
+// https://github.com/nodejs/node/issues/45421
+//
+// Check that node will NOT call v8::Isolate::SetIdle() when exiting
+// due to an unhandled exception, otherwise the assertion(enabled in
+// debug build only) in the SetIdle(), which checks that the vm state
+// is either EXTERNAL or IDLE will fail.
+//
+// The root cause of this issue is that before PerIsolateMessageListener()
+// is invoked by v8, v8 preserves the JS vm state, although it should
+// switch to EXTERNEL. https://bugs.chromium.org/p/v8/issues/detail?id=13464
+//
+// Therefore, this commit can be considered as an workaround of the v8 bug,
+// but we also find it not useful to call SetIdle() when terminating.
+
+if (process.argv[2] === 'child') {
+  const { Worker } = require('worker_threads');
+  new Worker('', { eval: true });
+  throw new Error('xxx');
+} else {
+  const assert = require('assert');
+  const { spawnSync } = require('child_process');
+  const result = spawnSync(process.execPath, [__filename, 'child']);
+
+  const stderr = result.stderr.toString().trim();
+  // Expect error message to be preserved
+  assert.match(stderr, /xxx/);
+  // Expect no crash
+  assert(!common.nodeProcessAborted(result.status, result.signal), stderr);
+}
Original file line number	Diff line number	Diff line change
@@ -802,6 +802,7 @@ ThreadId AllocateEnvironmentThreadId() {
802	802	}
803	803
804	804	void DefaultProcessExitHandler(Environment* env, int exit_code) {
	805	+ env->set_stopping(true);
805	806	env->set_can_call_into_js(false);
806	807	env->stop_sub_worker_contexts();
807	808	env->isolate()->DumpAndResetStats();