nodejs
diff --git a/Collapse file
‎src/node.h‎
Copy file name to clipboardExpand all lines: src/node.h
+1Lines changed: 1 addition & 0 deletions b/Collapse file
‎src/node.h‎
Copy file name to clipboardExpand all lines: src/node.h
+1Lines changed: 1 addition & 0 deletions
diff --git a/Collapse file
‎src/node_main_instance.cc‎
Copy file name to clipboardExpand all lines: src/node_main_instance.cc
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎src/node_main_instance.cc‎
Copy file name to clipboardExpand all lines: src/node_main_instance.cc
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎src/node_worker.cc‎
Copy file name to clipboardExpand all lines: src/node_worker.cc
+6-1Lines changed: 6 additions & 1 deletion b/Collapse file
‎src/node_worker.cc‎
Copy file name to clipboardExpand all lines: src/node_worker.cc
+6-1Lines changed: 6 additions & 1 deletion
diff --git a/Collapse file
‎test/cctest/node_test_fixture.h‎
Copy file name to clipboardExpand all lines: test/cctest/node_test_fixture.h
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎test/cctest/node_test_fixture.h‎
Copy file name to clipboardExpand all lines: test/cctest/node_test_fixture.h
+1-1Lines changed: 1 addition & 1 deletion
@@ -280,6 +280,7 @@ class NODE_EXTERN MultiIsolatePlatform : public v8::Platform {
 
   // This function may only be called once per `Isolate`, and discard any
   // pending delayed tasks scheduled for that isolate.
+  // This needs to be called right before calling `Isolate::Dispose()`.
   virtual void UnregisterIsolate(v8::Isolate* isolate) = 0;
 
   // The platform should call the passed function once all state associated
 
@@ -99,8 +99,8 @@ NodeMainInstance::~NodeMainInstance() {
   if (!owns_isolate_) {
     return;
   }
-  isolate_->Dispose();
   platform_->UnregisterIsolate(isolate_);
+  isolate_->Dispose();
 }
 
 int NodeMainInstance::Run() {
 
@@ -192,8 +192,13 @@ class WorkerThreadData {
         *static_cast<bool*>(data) = true;
       }, &platform_finished);
 
-      isolate->Dispose();
+      // The order of these calls is important; if the Isolate is first disposed
+      // and then unregistered, there is a race condition window in which no
+      // new Isolate at the same address can successfully be registered with
+      // the platform.
+      // (Refs: https://github.com/nodejs/node/issues/30846)
       w_->platform_->UnregisterIsolate(isolate);
+      isolate->Dispose();
 
       // Wait until the platform has cleaned up all relevant resources.
       while (!platform_finished)
 
@@ -106,9 +106,9 @@ class NodeTestFixture : public ::testing::Test {
 
   void TearDown() override {
     isolate_->Exit();
-    isolate_->Dispose();
     platform->DrainTasks(isolate_);
     platform->UnregisterIsolate(isolate_);
+    isolate_->Dispose();
     isolate_ = nullptr;
   }
 };
Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,8 @@ NodeMainInstance::~NodeMainInstance() {`
`99`	`99`	`if (!owns_isolate_) {`
`100`	`100`	`return;`
`101`	`101`	`}`
`102`		`- isolate_->Dispose();`
`103`	`102`	`platform_->UnregisterIsolate(isolate_);`
	`103`	`+ isolate_->Dispose();`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`int NodeMainInstance::Run() {`