worker: call CancelTerminateExecution() before exiting Locker · nodejs/node@b1a7fda · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 633
• Pull requests 759
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit b1a7fda

Browse filesBrowse the repository at this point in the historyBrowse files

addaleax

authored and

codebytere

committed

worker: call CancelTerminateExecution() before exiting Locker

As the comment indicates, this fixes a DCHECK failure, although I don’t quite understand why it is happening in the first place. PR-URL: #33347 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com>

1 parent 2dc5db8 commit b1a7fda
Copy full SHA for b1a7fda

1 file changed

+5Lines changed: 5 additions & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src
  • node_worker.cc

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/node_worker.cc‎

Copy file name to clipboardExpand all lines: src/node_worker.cc

+5Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -260,6 +260,11 @@ void Worker::Run() {
260	260
261	261	DeleteFnPtr<Environment, FreeEnvironment> env_;
262	262	auto cleanup_env = OnScopeLeave([&]() {
	263	+ // TODO(addaleax): This call is harmless but should not be necessary.
	264	+ // Figure out why V8 is raising a DCHECK() here without it
	265	+ // (in test/parallel/test-async-hooks-worker-asyncfn-terminate-4.js).
	266	+ isolate_->CancelTerminateExecution();
	267	+
263	268	if (!env_) return;
264	269	env_->set_can_call_into_js(false);
265	270

0 commit comments

Comments

0 (0)