Handle receiving GrowableObjectArrays correctly on native ports

runtime/vm/dart_api_message.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 "vm/dart_api_message.h"
 #include "vm/object.h"
 #include "vm/snapshot_ids.h"
 #include "vm/symbols.h"
 
 namespace dart {
@@ skipping 188 matching lines @@
     // updated (currently type_arguments is leaked).
     Dart_CObject* type_arguments = ReadObjectImpl();
     if (type_arguments != &type_arguments_marker &&
         type_arguments->type != Dart_CObject::kNull) {
       return AllocateDartCObjectUnsupported();
     }
     for (int i = 0; i < len; i++) {
       value->value.as_array.values[i] = ReadObjectRef();
     }
     return value;
-  } else if (class_id == kGrowableObjectArrayCid) {
-    // A GrowableObjectArray is serialized as its length followed by its backing
-    // store. The backing store is an array with a length which might be longer
-    // than the length of the GrowableObjectArray.
-    intptr_t len = ReadSmiValue();
-    Dart_CObject* value = GetBackRef(object_id);
-    ASSERT(value == NULL);
-    // Allocate an empty array for the GrowableObjectArray which will be updated
-    // to point to the content when the backing store has been deserialized.
-    value = AllocateDartCObjectArray(0);
-    AddBackRef(object_id, value, kIsDeserialized);
-    // Read the content of the GrowableObjectArray.
-    Dart_CObject* content = ReadObjectImpl();
-    ASSERT(content->type == Dart_CObject::kArray);
-    // Make the empty array allocated point to the backing store content.
-    value->value.as_array.length = len;
-    value->value.as_array.values = content->value.as_array.values;
-    return value;
   }
 
   return ReadInternalVMObject(class_id, object_id);
 }
 
 
 Dart_CObject* ApiMessageReader::ReadVMSymbol(intptr_t object_id) {
   if (Symbols::IsVMSymbolId(object_id)) {
     RawOneByteString* str =
         reinterpret_cast<RawOneByteString*>(Symbols::GetVMSymbol(object_id));
@@ skipping 41 matching lines @@
   ASSERT((class_header & kSmiTagMask) != 0);
   intptr_t object_id = SerializedHeaderData::decode(value);
   intptr_t class_id = LookupInternalClass(class_header);
   if ((class_id == kArrayCid) || (class_id == kImmutableArrayCid)) {
     ASSERT(GetBackRef(object_id) == NULL);
     intptr_t len = ReadSmiValue();
     Dart_CObject* value = AllocateDartCObjectArray(len);
     AddBackRef(object_id, value, kIsNotDeserialized);
     return value;
   }
+
   intptr_t tags = ReadIntptrValue();
   USE(tags);
 
   return ReadInternalVMObject(class_id, object_id);
 }
 
 
 Dart_CObject* ApiMessageReader::ReadInternalVMObject(intptr_t class_id,
                                                      intptr_t object_id) {
   switch (class_id) {
@@ skipping 85 matching lines @@
       Dart_CObject* object = AllocateDartCObjectUint8Array(len);
       AddBackRef(object_id, object, kIsDeserialized);
       if (len > 0) {
         uint8_t* p = object->value.as_byte_array.values;
         for (intptr_t i = 0; i < len; i++) {
           p[i] = Read<uint8_t>();
         }
       }
       return object;
     }
+    case kGrowableObjectArrayCid: {
+      // A GrowableObjectArray is serialized as its length followed by
+      // its backing store. The backing store is an array with a
+      // length which might be longer than the length of the
+      // GrowableObjectArray.
+      intptr_t len = ReadSmiValue();
+
+      Dart_CObject* value = GetBackRef(object_id);
+      ASSERT(value == NULL);
+      // Allocate an empty array for the GrowableObjectArray which
+      // will be updated to point to the content when the backing
+      // store has been deserialized.
+      value = AllocateDartCObjectArray(0);
+      AddBackRef(object_id, value, kIsDeserialized);
+      // Read the content of the GrowableObjectArray.
+      Dart_CObject* content = ReadObjectImpl();
+      ASSERT(content->type == Dart_CObject::kArray);
+      // Make the empty array allocated point to the backing store content.
+      value->value.as_array.length = len;
+      value->value.as_array.values = content->value.as_array.values;
+      return value;
+    }
     default:
       // Everything else not supported.
       return AllocateDartCObjectUnsupported();
   }
 }
 
 
 Dart_CObject* ApiMessageReader::ReadIndexedObject(intptr_t object_id) {
   if (object_id == kTrueValue) {
     return AllocateDartCObjectBool(true);
@@ skipping 391 matching lines @@
   // Write out all objects that were added to the forward list and have
   // not been serialized yet. These would typically be fields of arrays.
   // NOTE: The forward list might grow as we process the list.
   for (intptr_t i = 0; i < forward_id_; i++) {
     WriteForwardedCObject(forward_list_[i]);
   }
   UnmarkAllCObjects(object);
 }
 
 }  // namespace dart