Reapply "Use a single file for app snapshots."

runtime/vm/snapshot.h

 // Copyright (c) 2012, 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_SNAPSHOT_H_
 #define VM_SNAPSHOT_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/bitfield.h"
@@ skipping 732 matching lines @@
       next_object_offset_(DataSnapshot::kHeaderSize),
       instructions_(),
       objects_() {
   }
   virtual ~InstructionsWriter() { }
 
   int32_t GetOffsetFor(RawInstructions* instructions, RawCode* code);
 
   int32_t GetObjectOffsetFor(RawObject* raw_object);
 
-  virtual void Write() = 0;
+  virtual void Write(uint8_t* vmisolate_buffer,
+                     intptr_t vmisolate_length,
+                     uint8_t* isolate_buffer,
+                     intptr_t isolate_length) = 0;
   virtual intptr_t text_size() = 0;
   virtual intptr_t data_size() = 0;
 
  protected:
   struct InstructionsData {
     explicit InstructionsData(RawInstructions* insns,
                               RawCode* code,
                               intptr_t offset)
         : raw_insns_(insns), raw_code_(code), offset_(offset) { }
 
@@ skipping 32 matching lines @@
  public:
   AssemblyInstructionsWriter(uint8_t** assembly_buffer,
                              ReAlloc alloc,
                              intptr_t initial_size)
     : InstructionsWriter(),
       assembly_stream_(assembly_buffer, alloc, initial_size),
       text_size_(0),
       data_size_(0) {
   }
 
-  virtual void Write();
+  virtual void Write(uint8_t* vmisolate_buffer,
+                     intptr_t vmisolate_length,
+                     uint8_t* isolate_buffer,
+                     intptr_t isolate_length);
   virtual intptr_t text_size() { return text_size_; }
   virtual intptr_t data_size() { return data_size_; }
 
   intptr_t AssemblySize() const { return assembly_stream_.bytes_written(); }
 
  private:
   void WriteWordLiteralText(uword value) {
     // Padding is helpful for comparing the .S with --disassemble.
 #if defined(ARCH_IS_64_BIT)
     assembly_stream_.Print(".quad 0x%0.16" Px "\n", value);
@@ skipping 25 matching lines @@
  public:
   BlobInstructionsWriter(uint8_t** instructions_blob_buffer,
                          uint8_t** rodata_blob_buffer,
                          ReAlloc alloc,
                          intptr_t initial_size)
     : InstructionsWriter(),
       instructions_blob_stream_(instructions_blob_buffer, alloc, initial_size),
       rodata_blob_stream_(rodata_blob_buffer, alloc, initial_size) {
   }
 
-  virtual void Write();
+  virtual void Write(uint8_t* vmisolate_buffer,
+                     intptr_t vmisolate_length,
+                     uint8_t* isolate_buffer,
+                     intptr_t isolate_length);
   virtual intptr_t text_size() { return InstructionsBlobSize(); }
   virtual intptr_t data_size() { return RodataBlobSize(); }
 
   intptr_t InstructionsBlobSize() const {
     return instructions_blob_stream_.bytes_written();
   }
   intptr_t RodataBlobSize() const {
     return rodata_blob_stream_.bytes_written();
   }
 
@@ skipping 171 matching lines @@
  private:
   SnapshotWriter* writer_;
   bool as_references_;
 
   DISALLOW_COPY_AND_ASSIGN(SnapshotWriterVisitor);
 };
 
 }  // namespace dart
 
 #endif  // VM_SNAPSHOT_H_