Fixes the regression caused by 7568e1f18e.

runtime/vm/scavenger.cc

Index: runtime/vm/scavenger.cc
diff --git a/runtime/vm/scavenger.cc b/runtime/vm/scavenger.cc
index 3d40c23bcf6e030e6658ee4ba067cdf9a0d55fd4..5ea0c58944feb36bc078081194b11617c8896cb9 100644
--- a/runtime/vm/scavenger.cc
+++ b/runtime/vm/scavenger.cc
@@ -405,10 +405,8 @@ void Scavenger::Epilogue(Isolate* isolate,
 
   // Ensure the mutator thread will fail the next allocation. This will force
   // mutator to allocate a new TLAB
-  if (isolate->IsMutatorThreadScheduled()) {
-    Thread* mutator_thread = isolate->mutator_thread();
-    ASSERT(!mutator_thread->HasActiveTLAB());
-  }
+  Thread* mutator_thread = isolate->mutator_thread();
+  ASSERT((mutator_thread == NULL) || (!mutator_thread->HasActiveTLAB()));
 
   double avg_frac = stats_history_.Get(0).PromoCandidatesSuccessFraction();
   if (stats_history_.Size() >= 2) {
@@ -716,8 +714,8 @@ void Scavenger::ProcessWeakReferences() {
 
 void Scavenger::MakeNewSpaceIterable() const {
   ASSERT(heap_ != NULL);
-  if (heap_->isolate()->IsMutatorThreadScheduled() && !scavenging_) {
-    Thread* mutator_thread = heap_->isolate()->mutator_thread();
+  Thread* mutator_thread = heap_->isolate()->mutator_thread();
+  if (mutator_thread != NULL && !scavenging_) {
     if (mutator_thread->HasActiveTLAB()) {
       ASSERT(mutator_thread->top() <=
              mutator_thread->heap()->new_space()->top());
@@ -798,11 +796,9 @@ void Scavenger::Scavenge(bool invoke_api_callbacks) {
   int64_t post_safe_point = OS::GetCurrentMonotonicMicros();
   heap_->RecordTime(kSafePoint, post_safe_point - pre_safe_point);
 
-  if (isolate->IsMutatorThreadScheduled()) {
-    Thread* mutator_thread = isolate->mutator_thread();
-    if (mutator_thread->HasActiveTLAB()) {
-      heap_->AbandonRemainingTLAB(mutator_thread);
-    }
+  Thread* mutator_thread = isolate->mutator_thread();

[rmacnak, 2017/08/07 21:29:35]

It looks like isolate->mutator_thread_ is NULL while the mutator is unscheduled,
but we still want to invalidate its TLAB.

Siva, any thoughts on reaching into the ThreadRegistery versus not clearing
isolate->mutator_thread_ ?

[danunez, 2017/08/07 23:09:59]

It looks like isolate->mutator_thread() returns the one cached in
ThreadRegistry. Therefore, we have access to the mutator_thread and its TLAB
until ThreadRegistry itself is destroyed.

+  if ((mutator_thread != NULL) && (mutator_thread->HasActiveTLAB())) {
+    heap_->AbandonRemainingTLAB(mutator_thread);
   }
 
   // TODO(koda): Make verification more compatible with concurrent sweep.