Move ApiLocalScope out of class ApiState into class Thread so that the API local handles and zone e…

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 69 matching lines @@
   OSThread* os_thread = OSThread::Current();
   ASSERT(os_thread != NULL);
   ASSERT(isolate->heap() != NULL);
   if (is_mutator) {
     if (mutator_thread_ == NULL) {
       mutator_thread_ = GetThreadFromFreelist(isolate);
     }
     thread = mutator_thread_;
   } else {
     thread = GetThreadFromFreelist(isolate);
+    ASSERT(thread->api_top_scope() == NULL);
   }
   thread->isolate_ = isolate;
   thread->heap_ = isolate->heap();
   thread->set_os_thread(os_thread);
   os_thread->set_thread(thread);
   Thread::SetCurrent(thread);
   os_thread->EnableThreadInterrupts();
   return thread;
 }
 
 
 void ThreadRegistry::Unschedule(Thread* thread,
                                 bool is_mutator,
                                 bool bypass_safepoint) {
   MonitorLocker ml(monitor_);
   OSThread* os_thread = thread->os_thread();
   ASSERT(os_thread != NULL);
   os_thread->DisableThreadInterrupts();
   thread->isolate_ = NULL;
   thread->heap_ = NULL;
   thread->set_os_thread(NULL);
   os_thread->set_thread(NULL);
   OSThread::SetCurrent(os_thread);
   if (!is_mutator) {
+    ASSERT(thread->api_top_scope() == NULL);
     ReturnThreadToFreelist(thread);
   }
   if (!bypass_safepoint && in_rendezvous_) {
     // Don't wait for this thread.
     ASSERT(remaining_ > 0);
     if (--remaining_ == 0) {
       ml.NotifyAll();
     }
   }
 }
@@ skipping 94 matching lines @@
   intptr_t count = 0;
   Thread* current = active_list_;
   while (current != NULL) {
     ++count;
     current = current->next_;
   }
   return count;
 }
 
 }  // namespace dart