[heap] Make setting use_tasks_ explicit

gahaas · Commit Bot · commit 1e9504ba9e93 · 2018-02-13T17:32:15.000Z
At the moment the flag is set too late, it is possible that the GC still tries to post tasks in Isolate::Deinit when the isolate is already disconnected from the platform, see the referenced bug. R=ulan@chromium.org Bug: chromium:810739 Change-Id: Ibcd226cb44cc903f2a46e7cccf682b3938c9d408 Reviewed-on: https://chromium-review.googlesource.com/915942 Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Commit-Queue: Andreas Haas <ahaas@chromium.org> Cr-Commit-Position: refs/heads/master@{#51274}
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
@@ -5845,7 +5845,7 @@ void Heap::RegisterExternallyReferencedObject(Object** object) {
 }
 
 void Heap::TearDown() {
-  use_tasks_ = false;
+  DCHECK(!use_tasks_);
 #ifdef VERIFY_HEAP
   if (FLAG_verify_heap) {
     Verify();
diff --git a/src/heap/heap.h b/src/heap/heap.h
@@ -970,6 +970,8 @@ class Heap {
   // Returns whether SetUp has been called.
   bool HasBeenSetUp();
 
+  void stop_using_tasks() { use_tasks_ = false; }
+
   bool use_tasks() const { return use_tasks_; }
 
   // ===========================================================================
diff --git a/src/isolate.cc b/src/isolate.cc
@@ -2608,6 +2608,8 @@ void Isolate::ClearSerializerData() {
 void Isolate::Deinit() {
   TRACE_ISOLATE(deinit);
 
+  // Make sure that the GC does not post any new tasks.
+  heap_.stop_using_tasks();
   debug()->Unload();
 
   if (concurrent_recompilation_enabled()) {

Original file line number	Diff line number	Diff line change
`@@ -5845,7 +5845,7 @@ void Heap::RegisterExternallyReferencedObject(Object** object) {`
`5845`	`5845`	`}`
`5846`	`5846`
`5847`	`5847`	`void Heap::TearDown() {`
`5848`		`- use_tasks_ = false;`
	`5848`	`+ DCHECK(!use_tasks_);`
`5849`	`5849`	`#ifdef VERIFY_HEAP`
`5850`	`5850`	`if (FLAG_verify_heap) {`
`5851`	`5851`	`Verify();`