Revert "src: keep main-thread Isolate attached to platform during Dispose"

addaleax · targos · commit 40c5d580952e · 2020-04-28T16:00:51.000+02:00
This reverts commit e460f8c. It is no longer necessary after the previous commit, and restores consistency of the call order between the main thread code, the other call sites, and the documentation. Refs: #31795 PR-URL: #31853 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
diff --git a/src/node_main_instance.cc b/src/node_main_instance.cc
@@ -102,12 +102,8 @@ NodeMainInstance::~NodeMainInstance() {
   if (!owns_isolate_) {
     return;
   }
-  // TODO(addaleax): Reverse the order of these calls. The fact that we first
-  // dispose the Isolate is a temporary workaround for
-  // https://github.com/nodejs/node/issues/31752 -- V8 should not be posting
-  // platform tasks during Dispose(), but it does in some WASM edge cases.
-  isolate_->Dispose();
   platform_->UnregisterIsolate(isolate_);
+  isolate_->Dispose();
 }
 
 int NodeMainInstance::Run() {

Original file line number	Diff line number	Diff line change
`@@ -102,12 +102,8 @@ NodeMainInstance::~NodeMainInstance() {`
`102`	`102`	`if (!owns_isolate_) {`
`103`	`103`	`return;`
`104`	`104`	`}`
`105`		`- // TODO(addaleax): Reverse the order of these calls. The fact that we first`
`106`		`- // dispose the Isolate is a temporary workaround for`
`107`		`- // https://github.com/nodejs/node/issues/31752 -- V8 should not be posting`
`108`		`- // platform tasks during Dispose(), but it does in some WASM edge cases.`
`109`		`- isolate_->Dispose();`
`110`	`105`	`platform_->UnregisterIsolate(isolate_);`
	`106`	`+ isolate_->Dispose();`
`111`	`107`	`}`
`112`	`108`
`113`	`109`	`int NodeMainInstance::Run() {`