Make all reload zone allocations use the same zone

runtime/vm/isolate_reload.h

 // Copyright (c) 2016, 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_RELOAD_H_
 #define VM_ISOLATE_RELOAD_H_
 
 #include "include/dart_tools_api.h"
 
 #include "vm/hash_map.h"
@@ skipping 34 matching lines @@
 class RawGrowableObjectArray;
 class RawLibrary;
 class RawObject;
 class RawString;
 class Script;
 class UpdateClassesVisitor;
 
 
 class InstanceMorpher : public ZoneAllocated {
  public:
-  InstanceMorpher(const Class& from, const Class& to);
+  InstanceMorpher(Zone* zone, const Class& from, const Class& to);
   virtual ~InstanceMorpher() {}
 
   // Called on each instance that needs to be morphed.
   RawInstance* Morph(const Instance& instance) const;
 
   // Adds an object to be morphed.
   void AddObject(RawObject* object) const;
 
   // Create the morphed objects based on the before() list.
   void CreateMorphedCopies() const;
@@ skipping 20 matching lines @@
   ZoneGrowableArray<const Instance*>* after_;
   intptr_t cid_;
 
   void ComputeMapping();
   void DumpFormatFor(const Class& cls) const;
 };
 
 
 class ReasonForCancelling : public ZoneAllocated {
  public:
-  ReasonForCancelling() {}
+  explicit ReasonForCancelling(Zone* zone) {}
   virtual ~ReasonForCancelling() {}
 
   // Reports a reason for cancelling reload.
   void Report(IsolateReloadContext* context);
 
   // Conversion to a VM error object.
   // Default implementation calls ToString.
   virtual RawError* ToError();
 
   // Conversion to a string object.
   // Default implementation calls ToError.
   virtual RawString* ToString();
 
   // Append the reason to JSON array.
   virtual void AppendTo(JSONArray* array);
 
   // Concrete subclasses must override either ToError or ToString.
 };
 
 
 // Abstract class for also capturing the from_ and to_ class.
 class ClassReasonForCancelling : public ReasonForCancelling {
  public:
-  ClassReasonForCancelling(const Class& from, const Class& to)
-      : from_(from), to_(to) { }
+  ClassReasonForCancelling(Zone* zone, const Class& from, const Class& to)
+      : ReasonForCancelling(zone), from_(from), to_(to) { }
 
   void AppendTo(JSONArray* array);
 
  protected:
   const Class& from_;
   const Class& to_;
 };
 
 
 class IsolateReloadContext {
  public:
-  explicit IsolateReloadContext(Isolate* isolate, JSONStream* js);
+  explicit IsolateReloadContext(Isolate* isolate,
+                                JSONStream* js);
   ~IsolateReloadContext();
 
-  void StartReload(bool force_reload);
-  void FinishReload();
-  void AbortReload(const Error& error);
+  void Reload(bool force_reload);
 
-  RawLibrary* saved_root_library() const;
-
-  RawGrowableObjectArray* saved_libraries() const;
-
-  // Report back through the observatory channels.
-  void ReportError(const Error& error);
-  void ReportSuccess();
+  // All zone allocated objects must be allocated from this zone.
+  Zone* zone() const { return zone_; }
 
   bool reload_skipped() const { return reload_skipped_; }
+  bool reload_aborted() const { return reload_aborted_; }
+  RawError* error() const;
+  int64_t reload_timestamp() const { return reload_timestamp_; }
 
-  bool has_error() const { return HasReasonsForCancelling(); }
-  RawError* error() const;
-
-  int64_t reload_timestamp() const { return reload_timestamp_; }
+  static Dart_FileModifiedCallback file_modified_callback() {
+    return file_modified_callback_;
+  }
+  static void SetFileModifiedCallback(Dart_FileModifiedCallback callback) {
+    file_modified_callback_ = callback;
+  }
 
   static bool IsSameField(const Field& a, const Field& b);
   static bool IsSameLibrary(const Library& a_lib, const Library& b_lib);
   static bool IsSameClass(const Class& a, const Class& b);
 
+ private:
+  RawLibrary* saved_root_library() const;
+
+  RawGrowableObjectArray* saved_libraries() const;
+
   RawClass* FindOriginalClass(const Class& cls);
 
   bool IsDirty(const Library& lib);
 
   // Prefers old classes when we are in the middle of a reload.
   RawClass* GetClassForHeapWalkAt(intptr_t cid);
 
   void RegisterClass(const Class& new_cls);
 
   // Finds the library private key for |replacement_or_new| or return null
@@ skipping 17 matching lines @@
   void ReportOnJSON(JSONStream* stream);
 
   // Store morphing operation.
   void AddInstanceMorpher(InstanceMorpher* morpher);
 
   // Tells whether instance in the heap must be morphed.
   bool HasInstanceMorphers() const {
     return !instance_morphers_.is_empty();
   }
 
-  static Dart_FileModifiedCallback file_modified_callback() {
-    return file_modified_callback_;
-  }
-  static void SetFileModifiedCallback(Dart_FileModifiedCallback callback) {
-    file_modified_callback_ = callback;
-  }
+  // NOTE: FinalizeLoading will be called *before* Reload() returns.
+  void FinalizeLoading();
+  void AbortReload(const Error& error);
 
- private:
+  // Report back through the observatory channels.
+  void ReportError(const Error& error);
+  void ReportSuccess();
+
   void set_saved_root_library(const Library& value);
 
   void set_saved_libraries(const GrowableObjectArray& value);
 
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
 
   Isolate* isolate() { return isolate_; }
   ObjectStore* object_store();
 
   void EnsuredUnoptimizedCodeForStack();
@@ skipping 27 matching lines @@
   void PostCommit();
 
   void ClearReplacedObjectBits();
 
   // atomic_install:
   void MarkAllFunctionsForRecompilation();
   void ResetUnoptimizedICsOnStack();
   void ResetMegamorphicCaches();
   void InvalidateWorld();
 
+  // The zone used for all reload related allocations.
+  Zone* zone_;
+
   int64_t start_time_micros_;
   int64_t reload_timestamp_;
   Isolate* isolate_;
   bool reload_skipped_;
+  bool reload_aborted_;
   JSONStream* js_;
 
   intptr_t saved_num_cids_;
   RawClass** saved_class_table_;
   intptr_t num_saved_libs_;
 
   // Collect the necessary instance transformation for schema changes.
   ZoneGrowableArray<InstanceMorpher*> instance_morphers_;
 
   // Collects the reasons for cancelling the reload.
@@ skipping 51 matching lines @@
   RawArray* old_libraries_set_storage_;
   RawArray* library_map_storage_;
   RawArray* become_map_storage_;
   RawGrowableObjectArray* become_enum_mappings_;
   RawLibrary* saved_root_library_;
   RawGrowableObjectArray* saved_libraries_;
   RawObject** to() { return reinterpret_cast<RawObject**>(&saved_libraries_); }
 
   friend class Isolate;
   friend class Class;  // AddStaticFieldMapping, AddEnumBecomeMapping.
+  friend class Library;
   friend class ObjectLocator;
+  friend class MarkFunctionsForRecompilation;  // IsDirty.
+  friend class ReasonForCancelling;
 
   static Dart_FileModifiedCallback file_modified_callback_;
 };
 
 }  // namespace dart
 
 #endif   // VM_ISOLATE_RELOAD_H_