src: lock the isolate properly in IsolateData destructor

codebytere · codebytere · commit e7a89094a43d · 2025-04-25T21:21:20.000+02:00
nodejs/node#57031
diff --git a/patches/node/refactor_attach_cppgc_heap_on_v8_isolate_creation.patch b/patches/node/refactor_attach_cppgc_heap_on_v8_isolate_creation.patch
@@ -65,12 +65,13 @@ index 1c1062a3996f2bb7de9e91f7f4385c8f8d20f490..b0156ee26c29ebe5b79c97834f3bfe8b
    {
      // GC could still be run after the IsolateData is destroyed, so we store
      // the ids in a static map to ensure pointers to them are still valid
-@@ -605,14 +597,6 @@ IsolateData::IsolateData(Isolate* isolate,
+@@ -605,14 +597,5 @@ IsolateData::IsolateData(Isolate* isolate,
    }
  }
  
 -IsolateData::~IsolateData() {
 -  if (cpp_heap_ != nullptr) {
+-    v8::Locker locker(isolate_);
 -    // The CppHeap must be detached before being terminated.
 -    isolate_->DetachCppHeap();
 -    cpp_heap_->Terminate();

Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,13 @@ index 1c1062a3996f2bb7de9e91f7f4385c8f8d20f490..b0156ee26c29ebe5b79c97834f3bfe8b`
`65`	`65`	`{`
`66`	`66`	`// GC could still be run after the IsolateData is destroyed, so we store`
`67`	`67`	`// the ids in a static map to ensure pointers to them are still valid`
`68`		`-@@ -605,14 +597,6 @@ IsolateData::IsolateData(Isolate* isolate,`
	`68`	`+@@ -605,14 +597,5 @@ IsolateData::IsolateData(Isolate* isolate,`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`-IsolateData::~IsolateData() {`
`73`	`73`	`- if (cpp_heap_ != nullptr) {`
	`74`	`+- v8::Locker locker(isolate_);`
`74`	`75`	`- // The CppHeap must be detached before being terminated.`
`75`	`76`	`- isolate_->DetachCppHeap();`
`76`	`77`	`- cpp_heap_->Terminate();`