Refactor how we report reload results

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 809 matching lines @@
       deopt_context_(NULL),
       is_service_isolate_(false),
       stacktrace_(NULL),
       stack_frame_index_(-1),
       last_allocationprofile_accumulator_reset_timestamp_(0),
       last_allocationprofile_gc_timestamp_(0),
       object_id_ring_(NULL),
       tag_table_(GrowableObjectArray::null()),
       deoptimized_code_array_(GrowableObjectArray::null()),
       sticky_error_(Error::null()),
-      sticky_reload_error_(Error::null()),
       background_compiler_(NULL),
       background_compiler_disabled_depth_(0),
       pending_service_extension_calls_(GrowableObjectArray::null()),
       registered_service_extension_handlers_(GrowableObjectArray::null()),
       metrics_list_head_(NULL),
       compilation_allowed_(true),
       all_classes_finalized_(false),
       next_(NULL),
       pause_loop_monitor_(NULL),
       loading_invalidation_gen_(kInvalidGen),
@@ skipping 248 matching lines @@
 }
 
 
 #ifndef PRODUCT
 void Isolate::ReportReloadError(const Error& error) {
   ASSERT(IsReloading());
   reload_context_->AbortReload(error);
 }
 
 
-void Isolate::ReloadSources(bool force_reload,
+bool Isolate::ReloadSources(JSONStream* js,
+                            bool force_reload,
                             bool dont_delete_reload_context) {
   // TODO(asiva): Add verification of canonical objects.
   ASSERT(!IsReloading());
   has_attempted_reload_ = true;
-  reload_context_ = new IsolateReloadContext(this);
+  reload_context_ = new IsolateReloadContext(this, js);
   reload_context_->StartReload(force_reload);
+  bool success = !reload_context_->has_error();
   // TODO(asiva): Add verification of canonical objects.
   if (dont_delete_reload_context) {
     // Unit tests use the reload context later. Caller is responsible
     // for deleting the context.
-    return;
+    return success;
   }
   DeleteReloadContext();
+  return success;
 }
 
 
 void Isolate::DeleteReloadContext() {
   delete reload_context_;
   reload_context_ = NULL;
 }
 #endif  // !PRODUCT
 
 
 void Isolate::DoneFinalizing() {
   NOT_IN_PRODUCT(
     if (IsReloading()) {
       reload_context_->FinishReload();
-      if (reload_context_->has_error()) {
-        // Remember the reload error.
-        sticky_reload_error_ = reload_context_->error();
-      } else {
-        reload_context_->ReportSuccess();
-      }
     }
   )
 }
 
 
 
 bool Isolate::MakeRunnable() {
   ASSERT(Isolate::Current() == NULL);
 
   MutexLocker ml(mutex_);
@@ skipping 681 matching lines @@
     background_compiler()->VisitPointers(visitor);
   }
 
   // Visit the deoptimized code array which is stored in the isolate.
   visitor->VisitPointer(
       reinterpret_cast<RawObject**>(&deoptimized_code_array_));
 
   visitor->VisitPointer(
         reinterpret_cast<RawObject**>(&sticky_error_));
 
-  visitor->VisitPointer(
-        reinterpret_cast<RawObject**>(&sticky_reload_error_));
-
   // Visit the pending service extension calls.
   visitor->VisitPointer(
       reinterpret_cast<RawObject**>(&pending_service_extension_calls_));
 
   // Visit the registered service extension handlers.
   visitor->VisitPointer(
       reinterpret_cast<RawObject**>(&registered_service_extension_handlers_));
 
   // Visit the boxed_field_list_.
   // 'boxed_field_list_' access via mutator and background compilation threads
@@ skipping 240 matching lines @@
   // old space GC and remove the keep_code flag.
   deoptimized_code.Add(code);
 }
 
 
 void Isolate::clear_sticky_error() {
   sticky_error_ = Error::null();
 }
 
 
-void Isolate::clear_sticky_reload_error() {
-  sticky_reload_error_ = Error::null();
-}
-
-
 void Isolate::set_pending_service_extension_calls(
       const GrowableObjectArray& value) {
   pending_service_extension_calls_ = value.raw();
 }
 
 
 void Isolate::set_registered_service_extension_handlers(
     const GrowableObjectArray& value) {
   registered_service_extension_handlers_ = value.raw();
 }
@@ skipping 792 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