Merged: [heap] Make setting use_tasks_ explicit

gahaas · Commit Bot · commit c2a6be0b16b9 · 2018-03-12T13:29:12.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. NOTRY=true NOPRESUBMIT=true NOTREECHECKS=true 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-Original-Commit-Position: refs/heads/master@{#51274}(cherry picked from commit 1e9504b) Reviewed-on: https://chromium-review.googlesource.com/958961 Cr-Commit-Position: refs/branch-heads/6.5@{#69} Cr-Branched-From: 73c55f5-refs/heads/6.5.254@{#1} Cr-Branched-From: 594a1a0-refs/heads/master@{#50664}
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
@@ -5745,7 +5745,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
@@ -966,6 +966,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
@@ -2617,6 +2617,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
`@@ -5745,7 +5745,7 @@ void Heap::RegisterExternallyReferencedObject(Object** object) {`
`5745`	`5745`	`}`
`5746`	`5746`
`5747`	`5747`	`void Heap::TearDown() {`
`5748`		`- use_tasks_ = false;`
	`5748`	`+ DCHECK(!use_tasks_);`
`5749`	`5749`	`#ifdef VERIFY_HEAP`
`5750`	`5750`	`if (FLAG_verify_heap) {`
`5751`	`5751`	`Verify();`