Allocate a Dart_CMessage structure when decoding a message into C structures

runtime/vm/snapshot_test.cc

 // 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.
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/snapshot.h"
@@ skipping 24 matching lines @@
   }
   return false;
 }
 
 
 static uint8_t* allocator(uint8_t* ptr, intptr_t old_size, intptr_t new_size) {
   return reinterpret_cast<uint8_t*>(realloc(ptr, new_size));
 }
 
 
+static void FreeDeserializedDartMessage(Dart_CMessage* cmessage) {
+  for (int i = 0; i < cmessage->allocated_length; i++) {
+    free(cmessage->allocated[i]);
+  }
+  free(cmessage->original_message - Snapshot::kHeaderSize);
+  free(cmessage);
+}
+
+
 TEST_CASE(SerializeNull) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const Object& null_object = Object::Handle();
   writer.WriteObject(null_object.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   const Object& serialized_object = Object::Handle(reader.ReadObject());
   EXPECT(Equals(null_object, serialized_object));
 
   // Read object back from the snapshot into a C structure.

[siva, 2012/02/01 01:48:36]

If you start a Zone here and use a zone allocator method then you don't have to
implement the FreeDeserializedDartMessage function.

[Søren Gjesse, 2012/02/01 12:12:23]

Agree. But I wanted to cover the case where the embedder supplies an allocator
which is not zone but malloc based, and make sure that we provided sufficient
information for the embedder to correctly deallocate all allocated data.

Removed for now and use a zone allocator for allocating the structures for the
message decoding.

-  CMessageReader mreader(buffer + Snapshot::kHeaderSize,
-                        writer.BytesWritten(),
-                        &allocator);
-  Dart_CObject* cobject = mreader.ReadObject();
+  Dart_CMessage* cmessage = Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
+                                               writer.BytesWritten(),
+                                               &allocator);
+  Dart_CObject* cobject = cmessage->object;
   EXPECT_NOTNULL(cobject);
   EXPECT_EQ(Dart_CObject::kNull, cobject->type);
-  free(cobject);
+  FreeDeserializedDartMessage(cmessage);
 }
 
 
 TEST_CASE(SerializeSmi1) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const Smi& smi = Smi::Handle(Smi::New(124));
   writer.WriteObject(smi.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   const Object& serialized_object = Object::Handle(reader.ReadObject());
   EXPECT(Equals(smi, serialized_object));
 
   // Read object back from the snapshot into a C structure.
-  CMessageReader mreader(buffer + Snapshot::kHeaderSize,
-                         writer.BytesWritten(),
-                         &allocator);
-  Dart_CObject* cobject = mreader.ReadObject();
+  Dart_CMessage* cmessage = Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
+                                               writer.BytesWritten(),
+                                               &allocator);
+  Dart_CObject* cobject = cmessage->object;
   EXPECT_NOTNULL(cobject);
   EXPECT_EQ(Dart_CObject::kInt32, cobject->type);
   EXPECT_EQ(smi.Value(), cobject->value.as_int32);
-  free(cobject);
+  FreeDeserializedDartMessage(cmessage);

[siva, 2012/02/01 01:48:36]

Ditto comment here and below about not needing FreeDeserializedDartMessage

[Søren Gjesse, 2012/02/01 12:12:23]

See above.

 }
 
 
 TEST_CASE(SerializeSmi2) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const Smi& smi = Smi::Handle(Smi::New(-1));
   writer.WriteObject(smi.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   const Object& serialized_object = Object::Handle(reader.ReadObject());
   EXPECT(Equals(smi, serialized_object));
 
   // Read object back from the snapshot into a C structure.
-  CMessageReader mreader(buffer + Snapshot::kHeaderSize,
-                         writer.BytesWritten(),
-                         &allocator);
-  Dart_CObject* cobject = mreader.ReadObject();
+  Dart_CMessage* cmessage = Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
+                                               writer.BytesWritten(),
+                                               &allocator);
+  Dart_CObject* cobject = cmessage->object;
   EXPECT_NOTNULL(cobject);
   EXPECT_EQ(Dart_CObject::kInt32, cobject->type);
   EXPECT_EQ(smi.Value(), cobject->value.as_int32);
-  free(cobject);
+  FreeDeserializedDartMessage(cmessage);
 }
 
 
 TEST_CASE(SerializeDouble) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const Double& dbl = Double::Handle(Double::New(101.29));
   writer.WriteObject(dbl.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   const Object& serialized_object = Object::Handle(reader.ReadObject());
   EXPECT(Equals(dbl, serialized_object));
 
   // Read object back from the snapshot into a C structure.
-  CMessageReader mreader(buffer + Snapshot::kHeaderSize,
-                         writer.BytesWritten(),
-                         &allocator);
-  Dart_CObject* cobject = mreader.ReadObject();
+  Dart_CMessage* cmessage = Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
+                                               writer.BytesWritten(),
+                                               &allocator);
+  Dart_CObject* cobject = cmessage->object;
   EXPECT_NOTNULL(cobject);
   EXPECT_EQ(Dart_CObject::kDouble, cobject->type);
   EXPECT_EQ(dbl.value(), cobject->value.as_double);
-  free(cobject);
+  FreeDeserializedDartMessage(cmessage);
 }
 
 
 TEST_CASE(SerializeBool) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const Bool& bool1 = Bool::Handle(Bool::True());
   const Bool& bool2 = Bool::Handle(Bool::False());
   writer.WriteObject(bool1.raw());
   writer.WriteObject(bool2.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   EXPECT(Bool::True() == reader.ReadObject());
   EXPECT(Bool::False() == reader.ReadObject());
-
-  // Read object back from the snapshot into a C structure.
-  CMessageReader mreader(buffer + Snapshot::kHeaderSize,
-                         writer.BytesWritten(),
-                         &allocator);
-  Dart_CObject* cobject1 = mreader.ReadObject();
-  EXPECT_NOTNULL(cobject1);
-  EXPECT_EQ(Dart_CObject::kBool, cobject1->type);
-  EXPECT_EQ(true, cobject1->value.as_bool);
-  Dart_CObject* cobject2 = mreader.ReadObject();
-  EXPECT_NOTNULL(cobject2);
-  EXPECT_EQ(Dart_CObject::kBool, cobject2->type);
-  EXPECT_EQ(false, cobject2->value.as_bool);
-  free(cobject1);
-  free(cobject2);
 }
 
 
+TEST_CASE(SerializeTrue) {
+  // Write snapshot with true object.
+  uint8_t* buffer;
+  SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
+  const Bool& bl = Bool::Handle(Bool::True());
+  writer.WriteObject(bl.raw());
+  writer.FinalizeBuffer();
+
+  // Create a snapshot object using the buffer.
+  const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
+  USE(snapshot);

[siva, 2012/02/01 01:48:36]

Why not just Snapshot::SetupFromBuffer(buffer);

[Søren Gjesse, 2012/02/01 12:12:23]

Done.

+
+  // Read object back from the snapshot into a C structure.
+  Dart_CMessage* cmessage = Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
+                                               writer.BytesWritten(),
+                                               &allocator);
+  Dart_CObject* cobject = cmessage->object;
+  EXPECT_NOTNULL(cobject);
+  EXPECT_EQ(Dart_CObject::kBool, cobject->type);
+  EXPECT_EQ(true, cobject->value.as_bool);
+  FreeDeserializedDartMessage(cmessage);
+}
+
+
+TEST_CASE(SerializeFalse) {
+  // Write snapshot with false object.
+  uint8_t* buffer;
+  SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
+  const Bool& bl = Bool::Handle(Bool::False());
+  writer.WriteObject(bl.raw());
+  writer.FinalizeBuffer();
+
+  // Create a snapshot object using the buffer.
+  const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
+  USE(snapshot);

[siva, 2012/02/01 01:48:36]

Ditto.

[Søren Gjesse, 2012/02/01 12:12:23]

Done.

+
+  // Read object back from the snapshot into a C structure.
+  Dart_CMessage* cmessage = Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
+                                               writer.BytesWritten(),
+                                               &allocator);
+  Dart_CObject* cobject = cmessage->object;
+  EXPECT_NOTNULL(cobject);
+  EXPECT_EQ(Dart_CObject::kBool, cobject->type);
+  EXPECT_EQ(false, cobject->value.as_bool);
+  FreeDeserializedDartMessage(cmessage);
+}
+
+
 TEST_CASE(SerializeBigint) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const Bigint& bigint = Bigint::Handle(Bigint::New(0xfffffffffLL));
   writer.WriteObject(bigint.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   Bigint& obj = Bigint::Handle();
   obj ^= reader.ReadObject();
   OS::Print("%lld", BigintOperations::ToInt64(obj));
   EXPECT_EQ(BigintOperations::ToInt64(bigint), BigintOperations::ToInt64(obj));
 
   // Read object back from the snapshot into a C structure.
-  CMessageReader mreader(buffer + Snapshot::kHeaderSize,
-                         writer.BytesWritten(),
-                         &allocator);
-  Dart_CObject* cobject = mreader.ReadObject();
+  Dart_CMessage* cmessage = Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
+                                               writer.BytesWritten(),
+                                               &allocator);
+  Dart_CObject* cobject = cmessage->object;
   // Bigint not supported.
   EXPECT(cobject == NULL);
+  FreeDeserializedDartMessage(cmessage);
 }
 
 
 TEST_CASE(SerializeSingletons) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   writer.WriteObject(Object::class_class());
   writer.WriteObject(Object::null_class());
   writer.WriteObject(Object::type_class());
@@ skipping 54 matching lines @@
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   String& serialized_str = String::Handle();
   serialized_str ^= reader.ReadObject();
   EXPECT(str.Equals(serialized_str));
 
   // Read object back from the snapshot into a C structure.
-  CMessageReader mreader(buffer + Snapshot::kHeaderSize,
-                         writer.BytesWritten(),
-                         &allocator);
-  Dart_CObject* cobject = mreader.ReadObject();
+  Dart_CMessage* cmessage = Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
+                                               writer.BytesWritten(),
+                                               &allocator);
+  Dart_CObject* cobject = cmessage->object;
   EXPECT_EQ(Dart_CObject::kString, cobject->type);
   EXPECT_STREQ(cstr, cobject->value.as_string);
-  free(cobject);
+  FreeDeserializedDartMessage(cmessage);
 }
 
 
 TEST_CASE(SerializeArray) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const int kArrayLength = 10;
   Array& array = Array::Handle(Array::New(kArrayLength));
   Smi& smi = Smi::Handle();
   for (int i = 0; i < kArrayLength; i++) {
     smi ^= Smi::New(i);
     array.SetAt(i, smi);
   }
   writer.WriteObject(array.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   Array& serialized_array = Array::Handle();
   serialized_array ^= reader.ReadObject();
   EXPECT(array.Equals(serialized_array));
 
   // Read object back from the snapshot into a C structure.
-  CMessageReader mreader(buffer + Snapshot::kHeaderSize,
-                         writer.BytesWritten(),
-                         &allocator);
-  Dart_CObject* cobject = mreader.ReadObject();
+  Dart_CMessage* cmessage = Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
+                                               writer.BytesWritten(),
+                                               &allocator);
+  Dart_CObject* cobject = cmessage->object;
   EXPECT_EQ(Dart_CObject::kArray, cobject->type);
   EXPECT_EQ(kArrayLength, cobject->value.as_array.length);
   for (int i = 0; i < kArrayLength; i++) {
     Dart_CObject* element = cobject->value.as_array.values[i];
     EXPECT_EQ(Dart_CObject::kInt32, element->type);
     EXPECT_EQ(i, element->value.as_int32);
-    free(element);
   }
-  free(cobject);
+  FreeDeserializedDartMessage(cmessage);
 }
 
 
 TEST_CASE(SerializeEmptyArray) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const int kArrayLength = 0;
   Array& array = Array::Handle(Array::New(kArrayLength));
   writer.WriteObject(array.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   Array& serialized_array = Array::Handle();
   serialized_array ^= reader.ReadObject();
   EXPECT(array.Equals(serialized_array));
 
   // Read object back from the snapshot into a C structure.
-  CMessageReader mreader(buffer + Snapshot::kHeaderSize,
-                         writer.BytesWritten(),
-                         &allocator);
-  Dart_CObject* cobject = mreader.ReadObject();
+  Dart_CMessage* cmessage = Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
+                                               writer.BytesWritten(),
+                                               &allocator);
+  Dart_CObject* cobject = cmessage->object;
   EXPECT_EQ(Dart_CObject::kArray, cobject->type);
   EXPECT_EQ(kArrayLength, cobject->value.as_array.length);
   EXPECT(cobject->value.as_array.values == NULL);
-  free(cobject);
+  FreeDeserializedDartMessage(cmessage);
 }
 
 
 TEST_CASE(SerializeScript) {
   const char* kScriptChars =
       "class A {\n"
       "  static bar() { return 42; }\n"
       "  static fly() { return 5; }\n"
       "}\n";
 
@@ skipping 270 matching lines @@
 TEST_CASE(IntArrayMessage) {
   uint8_t* buffer = NULL;
   MessageWriter writer(&buffer, &allocator);
 
   static const int kArrayLength = 2;
   intptr_t data[kArrayLength] = {1, 2};
   int len = kArrayLength;
   writer.WriteMessage(len, data);
 
   // Read object back from the snapshot into a C structure.
-  CMessageReader mreader(buffer + Snapshot::kHeaderSize,
-                         writer.BytesWritten(),
-                         &allocator);
-  Dart_CObject* value = mreader.ReadObject();
-  EXPECT_EQ(Dart_CObject::kArray, value->type);
-  EXPECT_EQ(kArrayLength, value->value.as_array.length);
+  Dart_CMessage* cmessage = Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
+                                               writer.BytesWritten(),
+                                               &allocator);
+  Dart_CObject* cobject = cmessage->object;
+  EXPECT_EQ(Dart_CObject::kArray, cobject->type);
+  EXPECT_EQ(kArrayLength, cobject->value.as_array.length);
   for (int i = 0; i < kArrayLength; i++) {
-    Dart_CObject* element = value->value.as_array.values[i];
+    Dart_CObject* element = cobject->value.as_array.values[i];
     EXPECT_EQ(Dart_CObject::kInt32, element->type);
     EXPECT_EQ(i + 1, element->value.as_int32);
-    free(element);
   }
-  free(value);
+  FreeDeserializedDartMessage(cmessage);
 }
 
 
 // Helper function to call a top level Dart function, serialize the
 // result and deserialize the result into a Dart_CObject structure.
-static Dart_CObject* GetDeserializedDartObject(Dart_Handle lib,
-                                               const char* dart_function) {
+static Dart_CMessage* GetDeserializedDartMessage(Dart_Handle lib,
+                                                 const char* dart_function) {
   Dart_Handle result;
   result = Dart_InvokeStatic(lib,
                              Dart_NewString(""),
                              Dart_NewString(dart_function),
                              0,
                              NULL);
   EXPECT_VALID(result);
 
   // Serialize the list into a message.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const Object& list = Object::Handle(Api::UnwrapHandle(result));
   writer.WriteObject(list.raw());
   writer.FinalizeBuffer();
 
   // Read object back from the snapshot into a C structure.
-  CMessageReader reader(buffer + Snapshot::kHeaderSize,
-                        writer.BytesWritten(),
-                        &allocator);
-  Dart_CObject* value = reader.ReadObject();
-  free(buffer);
-  return value;
+  Dart_CMessage* cmessage = Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
+                                               writer.BytesWritten(),
+                                               &allocator);
+  return cmessage;
 }
 
 
 UNIT_TEST_CASE(DartGeneratedMessages) {
   static const char* kCustomIsolateScriptChars =
       "getSmi() {\n"
       "  return 42;\n"
       "}\n"
       "getString() {\n"
       "  return \"Hello, world!\";\n"
@@ skipping 31 matching lines @@
 
     {
       uint8_t* buffer;
       SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
       Smi& smi = Smi::Handle();
       smi ^= Api::UnwrapHandle(smi_result);
       writer.WriteObject(smi.raw());
       writer.FinalizeBuffer();
 
       // Read object back from the snapshot into a C structure.
-      CMessageReader mreader(buffer + Snapshot::kHeaderSize,
+      Dart_CMessage* cmessage =
+          Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
                              writer.BytesWritten(),
                              &allocator);
-      Dart_CObject* value = mreader.ReadObject();
-      EXPECT_NOTNULL(value);
-      EXPECT_EQ(Dart_CObject::kInt32, value->type);
-      EXPECT_EQ(42, value->value.as_int32);
-      free(value);
-      free(buffer);
+      Dart_CObject* cobject = cmessage->object;
+      EXPECT_NOTNULL(cobject);
+      EXPECT_EQ(Dart_CObject::kInt32, cobject->type);
+      EXPECT_EQ(42, cobject->value.as_int32);
+      FreeDeserializedDartMessage(cmessage);
     }
     {
       uint8_t* buffer;
       SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
       String& str = String::Handle();
       str ^= Api::UnwrapHandle(string_result);
       writer.WriteObject(str.raw());
       writer.FinalizeBuffer();
 
       // Read object back from the snapshot into a C structure.
-      CMessageReader mreader(buffer + Snapshot::kHeaderSize,
+      Dart_CMessage* cmessage =
+          Dart_DecodeMessage(buffer + Snapshot::kHeaderSize,
                              writer.BytesWritten(),
                              &allocator);
-      Dart_CObject* value = mreader.ReadObject();
-      EXPECT_NOTNULL(value);
-      EXPECT_EQ(Dart_CObject::kString, value->type);
-      EXPECT_STREQ("Hello, world!", value->value.as_string);
-      free(value);
-      free(buffer);
+      Dart_CObject* cobject = cmessage->object;
+      EXPECT_NOTNULL(cobject);
+      EXPECT_EQ(Dart_CObject::kString, cobject->type);
+      EXPECT_STREQ("Hello, world!", cobject->value.as_string);
+      FreeDeserializedDartMessage(cmessage);
     }
   }
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(DartGeneratedListMessages) {
   const int kArrayLength = 10;
   static const char* kScriptChars =
@@ skipping 26 matching lines @@
   Dart_EnterScope();
 
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
 
   {
     DARTSCOPE_NOCHECKS(isolate);
 
     {
       // Generate a list of nulls from Dart code.
-      Dart_CObject* value = GetDeserializedDartObject(lib, "getList");
+      Dart_CMessage* cmessage = GetDeserializedDartMessage(lib, "getList");
+      Dart_CObject* value = cmessage->object;
       EXPECT_NOTNULL(value);
       EXPECT_EQ(Dart_CObject::kArray, value->type);
       EXPECT_EQ(kArrayLength, value->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
         EXPECT_EQ(Dart_CObject::kNull, value->value.as_array.values[i]->type);
-        free(value->value.as_array.values[i]);
       }
-      free(value);
+      FreeDeserializedDartMessage(cmessage);
     }
     {
       // Generate a list of ints from Dart code.
-      Dart_CObject* value = GetDeserializedDartObject(lib, "getIntList");
+      Dart_CMessage* cmessage = GetDeserializedDartMessage(lib, "getIntList");
+      Dart_CObject* value = cmessage->object;
       EXPECT_NOTNULL(value);
       EXPECT_EQ(Dart_CObject::kArray, value->type);
       EXPECT_EQ(kArrayLength, value->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
         EXPECT_EQ(Dart_CObject::kInt32, value->value.as_array.values[i]->type);
         EXPECT_EQ(i, value->value.as_array.values[i]->value.as_int32);
-        free(value->value.as_array.values[i]);
       }
-      free(value);
+      FreeDeserializedDartMessage(cmessage);
     }
     {
       // Generate a list of strings from Dart code.
-      Dart_CObject* value = GetDeserializedDartObject(lib, "getStringList");
+      Dart_CMessage* cmessage =
+          GetDeserializedDartMessage(lib, "getStringList");
+      Dart_CObject* value = cmessage->object;
       EXPECT_NOTNULL(value);
       EXPECT_EQ(Dart_CObject::kArray, value->type);
       EXPECT_EQ(kArrayLength, value->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
         EXPECT_EQ(Dart_CObject::kString, value->value.as_array.values[i]->type);
         char buffer[3];
         snprintf(buffer, sizeof(buffer), "%d", i);
         EXPECT_STREQ(buffer, value->value.as_array.values[i]->value.as_string);
-        free(value->value.as_array.values[i]);
       }
-      free(value);
+      FreeDeserializedDartMessage(cmessage);
     }
     {
       // Generate a list of objects of different types from Dart code.
-      Dart_CObject* value = GetDeserializedDartObject(lib, "getMixedList");
+      Dart_CMessage* cmessage = GetDeserializedDartMessage(lib, "getMixedList");
+      Dart_CObject* value = cmessage->object;
       EXPECT_NOTNULL(value);
       EXPECT_EQ(Dart_CObject::kArray, value->type);
       EXPECT_EQ(kArrayLength, value->value.as_array.length);
 
       EXPECT_EQ(Dart_CObject::kInt32, value->value.as_array.values[0]->type);
       EXPECT_EQ(0, value->value.as_array.values[0]->value.as_int32);
       EXPECT_EQ(Dart_CObject::kString, value->value.as_array.values[1]->type);
       EXPECT_STREQ("1", value->value.as_array.values[1]->value.as_string);
       EXPECT_EQ(Dart_CObject::kDouble, value->value.as_array.values[2]->type);
       EXPECT_EQ(2.2, value->value.as_array.values[2]->value.as_double);
       EXPECT_EQ(Dart_CObject::kBool, value->value.as_array.values[3]->type);
       EXPECT_EQ(true, value->value.as_array.values[3]->value.as_bool);
 
       for (int i = 0; i < kArrayLength; i++) {
         if (i > 3) {
           EXPECT_EQ(Dart_CObject::kNull, value->value.as_array.values[i]->type);
         }
-        free(value->value.as_array.values[i]);
       }
-      free(value);
+      FreeDeserializedDartMessage(cmessage);
     }
   }
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(DartGeneratedListMessagesWithBackref) {
   const int kArrayLength = 10;
   static const char* kScriptChars =
@@ skipping 31 matching lines @@
   Dart_EnterScope();
 
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
 
   {
     DARTSCOPE_NOCHECKS(isolate);
 
     {
       // Generate a list of strings from Dart code.
-      Dart_CObject* object = GetDeserializedDartObject(lib, "getStringList");
+      Dart_CMessage* cmessage =
+          GetDeserializedDartMessage(lib, "getStringList");
+      Dart_CObject* object = cmessage->object;
       EXPECT_NOTNULL(object);
       EXPECT_EQ(Dart_CObject::kArray, object->type);
       EXPECT_EQ(kArrayLength, object->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
         Dart_CObject* element = object->value.as_array.values[i];
         EXPECT_EQ(object->value.as_array.values[0], element);
         EXPECT_EQ(Dart_CObject::kString, element->type);
         EXPECT_STREQ("Hello, world!", element->value.as_string);
       }
-      free(object->value.as_array.values[0]);
-      free(object);
+      FreeDeserializedDartMessage(cmessage);
     }
     {
       // Generate a list of doubles from Dart code.
-      Dart_CObject* object = GetDeserializedDartObject(lib, "getDoubleList");
+      Dart_CMessage* cmessage =
+          GetDeserializedDartMessage(lib, "getDoubleList");
+      Dart_CObject* object = cmessage->object;
       EXPECT_NOTNULL(object);
       EXPECT_EQ(Dart_CObject::kArray, object->type);
       EXPECT_EQ(kArrayLength, object->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
         Dart_CObject* element = object->value.as_array.values[i];
         EXPECT_EQ(object->value.as_array.values[0], element);
         EXPECT_EQ(Dart_CObject::kDouble, element->type);
         EXPECT_EQ(3.14, element->value.as_double);
       }
-      free(object->value.as_array.values[0]);
-      free(object);
+      FreeDeserializedDartMessage(cmessage);
     }
     {
       // Generate a list of objects of different types from Dart code.
-      Dart_CObject* object = GetDeserializedDartObject(lib, "getMixedList");
+      Dart_CMessage* cmessage = GetDeserializedDartMessage(lib, "getMixedList");
+      Dart_CObject* object = cmessage->object;
       EXPECT_NOTNULL(object);
       EXPECT_EQ(Dart_CObject::kArray, object->type);
       EXPECT_EQ(kArrayLength, object->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
         Dart_CObject* element = object->value.as_array.values[i];
         if ((i % 2) == 0) {
           EXPECT_EQ(object->value.as_array.values[0], element);
           EXPECT_EQ(Dart_CObject::kString, element->type);
           EXPECT_STREQ("A", element->value.as_string);
         } else {
           EXPECT_EQ(object->value.as_array.values[1], element);
           EXPECT_EQ(Dart_CObject::kDouble, element->type);
           EXPECT_STREQ(2.72, element->value.as_double);
         }
       }
-      free(object->value.as_array.values[0]);
-      free(object->value.as_array.values[1]);
-      free(object);
+      FreeDeserializedDartMessage(cmessage);
     }
     {
       // Generate a list of objects of different types from Dart code.
-      Dart_CObject* object = GetDeserializedDartObject(lib, "getSelfRefList");
+      Dart_CMessage* cmessage =
+          GetDeserializedDartMessage(lib, "getSelfRefList");
+      Dart_CObject* object = cmessage->object;
       EXPECT_NOTNULL(object);
       EXPECT_EQ(Dart_CObject::kArray, object->type);
       EXPECT_EQ(kArrayLength, object->value.as_array.length);
       for (int i = 0; i < kArrayLength; i++) {
         Dart_CObject* element = object->value.as_array.values[i];
         EXPECT_EQ(Dart_CObject::kArray, element->type);
         EXPECT_EQ(object, element);
       }
-      free(object);
+      FreeDeserializedDartMessage(cmessage);
     }
   }
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart