Refactor how we report reload results

runtime/vm/isolate.h

 // 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.
 
 #ifndef VM_ISOLATE_H_
 #define VM_ISOLATE_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/atomic.h"
@@ skipping 231 matching lines @@
       const uint8_t* instructions_snapshot_buffer);
 
   void ScheduleMessageInterrupts();
 
   // Marks all libraries as loaded.
   void DoneLoading();
   void DoneFinalizing();
 
   // By default the reload context is deleted. This parameter allows
   // the caller to delete is separately if it is still needed.
-  void ReloadSources(bool force_reload,
+  bool ReloadSources(JSONStream* js,
+                     bool force_reload,
                      bool dont_delete_reload_context = false);
 
   bool MakeRunnable();
   void Run();
 
   MessageHandler* message_handler() const { return message_handler_; }
   void set_message_handler(MessageHandler* value) { message_handler_ = value; }
 
   bool is_runnable() const { return is_runnable_; }
   void set_is_runnable(bool value) {
@@ skipping 269 matching lines @@
 
   RawGrowableObjectArray* deoptimized_code_array() const {
     return deoptimized_code_array_;
   }
   void set_deoptimized_code_array(const GrowableObjectArray& value);
   void TrackDeoptimizedCode(const Code& code);
 
   RawError* sticky_error() const { return sticky_error_; }
   void clear_sticky_error();
 
-  RawError* sticky_reload_error() const { return sticky_reload_error_; }
-  void clear_sticky_reload_error();
-
   bool compilation_allowed() const { return compilation_allowed_; }
   void set_compilation_allowed(bool allowed) {
     compilation_allowed_ = allowed;
   }
 
   // In precompilation we finalize all regular classes before compiling.
   bool all_classes_finalized() const { return all_classes_finalized_; }
   void set_all_classes_finalized(bool value) {
     all_classes_finalized_ = value;
   }
@@ skipping 209 matching lines @@
   // Ring buffer of objects assigned an id.
   ObjectIdRing* object_id_ring_;
 
   VMTagCounters vm_tag_counters_;
   RawGrowableObjectArray* tag_table_;
 
   RawGrowableObjectArray* deoptimized_code_array_;
 
   RawError* sticky_error_;
 
-  RawError* sticky_reload_error_;
-
   // Background compilation.
   BackgroundCompiler* background_compiler_;
   intptr_t background_compiler_disabled_depth_;
 
   // We use 6 list entries for each pending service extension calls.
   enum {
     kPendingHandlerIndex = 0,
     kPendingMethodNameIndex,
     kPendingKeysIndex,
     kPendingValuesIndex,
@@ skipping 208 matching lines @@
   intptr_t* spawn_count_;
 
   Dart_IsolateFlags isolate_flags_;
   bool paused_;
   bool errors_are_fatal_;
 };
 
 }  // namespace dart
 
 #endif  // VM_ISOLATE_H_