Commit d76e16b
src: enter isolate before destructing IsolateData
MVP fix for a worker_threads crash where ~WorkerThreadData() ->
~IsolateData() -> Isolate::DetachCppHeap() kicks off a round of
garbage collection that expects an entered isolate.
No test because the crash is not reliably reproducable but the bug
is pretty clearly described in the linked issue and is obvious once
you see it, IMO.
Fixes: #51129
PR-URL: #51138
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>1 parent f79ac33 commit d76e16b
1 file changed
Lines changed: 7 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -217,7 +217,13 @@ class WorkerThreadData { | |||
| 217 | 217 | CHECK(!loop_init_failed_); | |
| 218 | 218 | bool platform_finished = false; | |
| 219 | 219 | ||
| 220 | - isolate_data_.reset(); | ||
| 220 | + // https://github.com/nodejs/node/issues/51129 - IsolateData destructor | ||
| 221 | + // can kick off GC before teardown, so ensure the isolate is entered. | ||
| 222 | + { | ||
| 223 | + Locker locker(isolate); | ||
| 224 | + Isolate::Scope isolate_scope(isolate); | ||
| 225 | + isolate_data_.reset(); | ||
| 226 | + } | ||
| 221 | 227 | ||
| 222 | 228 | w_->platform_->AddIsolateFinishedCallback(isolate, [](void* data) { | |
| 223 | 229 | *static_cast<bool*>(data) = true; | |
0 commit comments