Add IsMutatorThread to the Thread class and use it instead of MutatorThreadIsCurrentThread

runtime/vm/thread.cc

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/thread.h"
 
 #include "vm/growable_array.h"
 #include "vm/isolate.h"
 #include "vm/lockers.h"
 #include "vm/log.h"
@@ skipping 323 matching lines @@
   ASSERT(thread->store_buffer_block_ == NULL);
   // TODO(koda): Use StoreBufferAcquire once we properly flush before Scavenge.
   thread->store_buffer_block_ =
       thread->isolate()->store_buffer()->PopEmptyBlock();
   ASSERT(isolate->heap() != NULL);
   thread->heap_ = isolate->heap();
   ASSERT(thread->thread_interrupt_callback_ == NULL);
   ASSERT(thread->thread_interrupt_data_ == NULL);
   // Do not update isolate->mutator_thread, but perform sanity check:
   // this thread should not be both the main mutator and helper.
-  ASSERT(!isolate->MutatorThreadIsCurrentThread());
+  ASSERT(!thread->IsMutatorThread());
   thread->Schedule(isolate, bypass_safepoint);
 }
 
 
 void Thread::ExitIsolateAsHelper(bool bypass_safepoint) {
   Thread* thread = Thread::Current();
   Isolate* isolate = thread->isolate();
   ASSERT(isolate != NULL);
   thread->Unschedule(bypass_safepoint);
   // TODO(koda): Move store_buffer_block_ into State.
   thread->StoreBufferRelease();
   thread->isolate_ = NULL;
   thread->heap_ = NULL;
-  ASSERT(!isolate->MutatorThreadIsCurrentThread());
+  ASSERT(!thread->IsMutatorThread());
 }
 
 
 // TODO(koda): Make non-static and invoke in SafepointThreads.
 void Thread::PrepareForGC() {
   Thread* thread = Thread::Current();
   // Prevent scheduling another GC.
   thread->StoreBufferRelease(StoreBuffer::kIgnoreThreshold);
   // Make sure to get an *empty* block; the isolate needs all entries
   // at GC time.
@@ skipping 30 matching lines @@
   store_buffer_block_ = NULL;
   isolate_->store_buffer()->PushBlock(block, policy);
 }
 
 
 void Thread::StoreBufferAcquire() {
   store_buffer_block_ = isolate()->store_buffer()->PopNonFullBlock();
 }
 
 
+bool Thread::IsMutatorThread() const {
+  return ((isolate_ != NULL) && (isolate_->mutator_thread() == this));
+}
+
+
 CHA* Thread::cha() const {
   ASSERT(isolate_ != NULL);
   return cha_;
 }
 
 
 void Thread::set_cha(CHA* value) {
   ASSERT(isolate_ != NULL);
   cha_ = value;
 }
@@ skipping 124 matching lines @@
 Thread* ThreadIterator::Next() {
   ASSERT(Thread::thread_list_lock_ != NULL);
   ASSERT(Thread::thread_list_lock_->IsOwnedByCurrentThread());
   Thread* current = next_;
   next_ = next_->thread_list_next_;
   return current;
 }
 
 
 }  // namespace dart