Make all reload zone allocations use the same zone

runtime/vm/isolate.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/isolate.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 #include "platform/assert.h"
 #include "platform/text_buffer.h"
@@ skipping 1083 matching lines @@
   reload_context_->AbortReload(error);
 }
 
 
 bool Isolate::ReloadSources(JSONStream* js,
                             bool force_reload,
                             bool dont_delete_reload_context) {
   ASSERT(!IsReloading());
   has_attempted_reload_ = true;
   reload_context_ = new IsolateReloadContext(this, js);
-  reload_context_->StartReload(force_reload);
-  bool success = !reload_context_->has_error();
-  // Unit tests use the reload context later. Caller is responsible
-  // for deleting the context.
+  reload_context_->Reload(force_reload);
+  bool success = !reload_context_->reload_aborted();
   if (!dont_delete_reload_context) {
     DeleteReloadContext();
   }
 #if defined(DEBUG)
   if (success) {
+    return success;
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     isolate->heap()->CollectAllGarbage();
     VerifyCanonicalVisitor check_canonical(thread);
     isolate->heap()->IterateObjects(&check_canonical);
   }
 #endif  // DEBUG
   return success;
 }
 
 
 void Isolate::DeleteReloadContext() {
   delete reload_context_;
   reload_context_ = NULL;
 }
 #endif  // !PRODUCT
 
 
 void Isolate::DoneFinalizing() {
   NOT_IN_PRODUCT(
     if (IsReloading()) {
-      reload_context_->FinishReload();
+      reload_context_->FinalizeLoading();
     }
   )
 }
 
 
 
 bool Isolate::MakeRunnable() {
   ASSERT(Isolate::Current() == NULL);
 
   MutexLocker ml(mutex_);
@@ skipping 1753 matching lines @@
 void IsolateSpawnState::DecrementSpawnCount() {
   ASSERT(spawn_count_monitor_ != NULL);
   ASSERT(spawn_count_ != NULL);
   MonitorLocker ml(spawn_count_monitor_);
   ASSERT(*spawn_count_ > 0);
   *spawn_count_ = *spawn_count_ - 1;
   ml.Notify();
 }
 
 }  // namespace dart