Allocate a Dart_CMessage structure when decoding a message into C structures

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 406 matching lines @@
   };
 };
 
 
 // Reads a message snapshot into C structure.
 class CMessageReader : public BaseReader {
  public:
   CMessageReader(const uint8_t* buffer, intptr_t length, ReAlloc alloc);
   ~CMessageReader() { }
 
-  Dart_CObject* ReadObject();
+  Dart_CMessage* ReadMessage();
 
  private:
   // Allocates a Dart_CObject object on the C heap.
   Dart_CObject* AllocateDartCObject();
   // Allocates a Dart_CObject object with the specified type on the C heap.
   Dart_CObject* AllocateDartCObject(Dart_CObject::Type type);
   // Allocates a Dart_CObject object for the null object on the C heap.
   Dart_CObject* AllocateDartCObjectNull();
   // Allocates a Dart_CObject object for a boolean object on the C heap.
   Dart_CObject* AllocateDartCObjectBool(bool value);
   // Allocates a Dart_CObject object for for a 32-bit integer on the C heap.
   Dart_CObject* AllocateDartCObjectInt32(int32_t value);
   // Allocates a Dart_CObject object for a double on the C heap.
   Dart_CObject* AllocateDartCObjectDouble(double value);
   // Allocates a Dart_CObject object for string data on the C heap.
   Dart_CObject* AllocateDartCObjectString(intptr_t length);
   // Allocates a C array of Dart_CObject objects on the C heap.
   Dart_CObject* AllocateDartCObjectArray(intptr_t length);
 
   intptr_t LookupInternalClass(intptr_t class_header);
   Dart_CObject* ReadInlinedObject(intptr_t object_id);
   Dart_CObject* ReadObjectImpl(intptr_t header);
   Dart_CObject* ReadIndexedObject(intptr_t object_id);
+  Dart_CObject* ReadObject();
 
   // Add object to backward references.
   void AddBackwardReference(intptr_t id, Dart_CObject* obj);
 
   Dart_CObject_Internal* AsInternal(Dart_CObject* object) {
     ASSERT(object->type >= Dart_CObject::kNumberOfTypes);
     return reinterpret_cast<Dart_CObject_Internal*>(object);
   }
 
   ReAlloc alloc_;
   GrowableArray<Dart_CObject*> backward_references_;
+  GrowableArray<Dart_CObject*> allocated_;
 
   Dart_CObject type_arguments_marker;
   Dart_CObject dynamic_type_marker;
+
+  const uint8_t* original_message_;
+  intptr_t original_message_length_;
 };
 
 
 class BaseWriter {
  public:
   // Size of the snapshot.
   intptr_t BytesWritten() const { return stream_.bytes_written(); }
 
   // Writes raw data to the stream (basic type).
   // sizeof(T) must be in {1,2,4,8}.
@@ skipping 158 matching lines @@
 
  private:
   SnapshotWriter* writer_;
 
   DISALLOW_COPY_AND_ASSIGN(SnapshotWriterVisitor);
 };
 
 }  // namespace dart
 
 #endif  // VM_SNAPSHOT_H_