Clear reusable handles of helper threads as well. Visit mutator_thread_ even if it is not active (a…

runtime/vm/thread_registry.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_registry.h"
 
 #include "vm/isolate.h"
 #include "vm/lockers.h"
 
 namespace dart {
@@ skipping 47 matching lines @@
   if (!is_mutator) {
     ASSERT(thread->api_top_scope() == NULL);
     ReturnToFreelistLocked(thread);
   }
 }
 
 
 void ThreadRegistry::VisitObjectPointers(ObjectPointerVisitor* visitor,
                                          bool validate_frames) {
   MonitorLocker ml(threads_lock());
+  bool mutator_thread_visited = false;
   Thread* thread = active_list_;
   while (thread != NULL) {
     if (thread->zone() != NULL) {
       thread->zone()->VisitObjectPointers(visitor);
     }
     thread->VisitObjectPointers(visitor);
+    if (mutator_thread_ == thread) {
+      mutator_thread_visited = true;
+    }
     // Iterate over all the stack frames and visit objects on the stack.
     StackFrameIterator frames_iterator(thread->top_exit_frame_info(),
                                        validate_frames);
     StackFrame* frame = frames_iterator.NextFrame();
     while (frame != NULL) {
       frame->VisitObjectPointers(visitor);
       frame = frames_iterator.NextFrame();
     }
     thread = thread->next_;
   }
+  // Visit mutator thread even if it is not in the active list because of
+  // api handles.
+  if (!mutator_thread_visited && (mutator_thread_ != NULL)) {
+    mutator_thread_->VisitObjectPointers(visitor);
+  }
 }
 
 
 void ThreadRegistry::PrepareForGC() {
   MonitorLocker ml(threads_lock());
   Thread* thread = active_list_;
   while (thread != NULL) {
     thread->PrepareForGC();
     thread = thread->next_;
   }
@@ skipping 46 matching lines @@
   ASSERT(thread->os_thread_ == NULL);
   ASSERT(thread->isolate_ == NULL);
   ASSERT(thread->heap_ == NULL);
   ASSERT(threads_lock()->IsOwnedByCurrentThread());
   // Add thread to the free list.
   thread->next_ = free_list_;
   free_list_ = thread;
 }
 
 }  // namespace dart