Add support for lists and backward references when decoding a message to a Dart_CObject object

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 386 matching lines @@
   String& str_;  // Temporary String handle.
   Library& library_;  // Temporary library handle.
   AbstractType& type_;  // Temporary type handle.
   AbstractTypeArguments& type_arguments_;  // Temporary type argument handle.
   GrowableArray<Object*> backward_references_;
 
   DISALLOW_COPY_AND_ASSIGN(SnapshotReader);
 };
 
 
+// Use this C structure for reading internal objects in the serialized
+// data. These are objects that we need to process in order to
+// generate the Dart_CObject graph but that we don't want to expose in
+// that graph.
+// TODO(sjesse): Remove this when message serialization format is
+// updated.
+struct Dart_CObject_Internal : public Dart_CObject {
+  enum Type {
+    kTypeArguments = Dart_CObject::kNumberOfTypes,
+    kDynamicType,
+  };
+};
+
+
 // 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();
 
  private:
   // Allocates a Dart_CObject object on the C heap.
-  Dart_CObject* AllocateDartValue();
+  Dart_CObject* AllocateDartCObject();
   // Allocates a Dart_CObject object with the specified type on the C heap.
-  Dart_CObject* AllocateDartValue(Dart_CObject::Type type);
+  Dart_CObject* AllocateDartCObject(Dart_CObject::Type type);
   // Allocates a Dart_CObject object for the null object on the C heap.
-  Dart_CObject* AllocateDartValueNull();
+  Dart_CObject* AllocateDartCObjectNull();
   // Allocates a Dart_CObject object for a boolean object on the C heap.
-  Dart_CObject* AllocateDartValueBool(bool value);
+  Dart_CObject* AllocateDartCObjectBool(bool value);
   // Allocates a Dart_CObject object for for a 32-bit integer on the C heap.
-  Dart_CObject* AllocateDartValueInt32(int32_t value);
+  Dart_CObject* AllocateDartCObjectInt32(int32_t value);
   // Allocates a Dart_CObject object for a double on the C heap.
-  Dart_CObject* AllocateDartValueDouble(double value);
+  Dart_CObject* AllocateDartCObjectDouble(double value);
   // Allocates a Dart_CObject object for string data on the C heap.
-  Dart_CObject* AllocateDartValueString(intptr_t length);
+  Dart_CObject* AllocateDartCObjectString(intptr_t length);
   // Allocates a C array of Dart_CObject objects on the C heap.
-  Dart_CObject* AllocateDartValueArray(intptr_t length);
+  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);
 
+  // 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_;
+
+  Dart_CObject type_arguments_marker;
+  Dart_CObject dynamic_type_marker;
 };
 
 
 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_