Fix for issue 25236

runtime/vm/dart.cc

 // Copyright (c) 2013, 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/dart.h"
 
 #include "vm/code_observers.h"
 #include "vm/cpu.h"
 #include "vm/dart_api_state.h"
 #include "vm/dart_entry.h"
@@ skipping 204 matching lines @@
   ASSERT(Isolate::isolates_list_head_ == Dart::vm_isolate());
 }
 
 
 const char* Dart::Cleanup() {
   ASSERT(Isolate::Current() == NULL);
   if (vm_isolate_ == NULL) {
     return "VM already terminated.";
   }
 
+  // Disable creation of any new OSThread structures which means no more new
+  // threads can do an EnterIsolate.
+  OSThread::DisableOSThreadCreation();
+
   // Shut down profiling.
   Profiler::Shutdown();
 
   {
     // Set the VM isolate as current isolate when shutting down
     // Metrics so that we can use a StackZone.
-    Thread::EnterIsolate(vm_isolate_);
+    bool result = Thread::EnterIsolate(vm_isolate_);
+    ASSERT(result);
     Metric::Cleanup();
     Thread::ExitIsolate();
   }
 
   if (FLAG_shutdown) {
     // Disable the creation of new isolates.
     Isolate::DisableIsolateCreation();
 
     // Send the OOB Kill message to all remaining application isolates.
     Isolate::KillAllIsolates(Isolate::kInternalKillMsg);
 
     // Shutdown the service isolate.
     ServiceIsolate::Shutdown();
 
     // Wait for all application isolates and the service isolate to shutdown
     // before shutting down the thread pool.
     WaitForIsolateShutdown();
 
     // Shutdown the thread pool. On return, all thread pool threads have exited.
     delete thread_pool_;
     thread_pool_ = NULL;
 
     // Set the VM isolate as current isolate.
-    Thread::EnterIsolate(vm_isolate_);
+    bool result = Thread::EnterIsolate(vm_isolate_);
+    ASSERT(result);
 
     ShutdownIsolate();
     vm_isolate_ = NULL;
     ASSERT(Isolate::IsolateListLength() == 0);
 
     TargetCPUFeatures::Cleanup();
     StoreBuffer::ShutDown();
 
     // Delete the current thread's TLS and set it's TLS to null.
     // If it is the last thread then the destructor would call
@@ skipping 134 matching lines @@
   ServiceIsolate::SendIsolateShutdownMessage();
   if (callback != NULL) {
     (callback)(callback_data);
   }
 }
 
 
 void Dart::ShutdownIsolate(Isolate* isolate) {
   ASSERT(Isolate::Current() == NULL);
   // We need to enter the isolate in order to shut it down.
-  Thread::EnterIsolate(isolate);
+  bool result = Thread::EnterIsolate(isolate);
+  ASSERT(result);
   ShutdownIsolate();
   // Since the isolate is shutdown and deleted, there is no need to
   // exit the isolate here.
   ASSERT(Isolate::Current() == NULL);
 }
 
 
 void Dart::ShutdownIsolate() {
   Isolate* isolate = Isolate::Current();
   isolate->Shutdown();
@@ skipping 20 matching lines @@
   return predefined_handles_->handles_.IsValidScopedHandle(address);
 }
 
 
 bool Dart::IsReadOnlyApiHandle(Dart_Handle handle) {
   ASSERT(predefined_handles_ != NULL);
   return predefined_handles_->api_handles_.IsValidHandle(handle);
 }
 
 }  // namespace dart