Handle receiving GrowableObjectArrays correctly on native ports

runtime/vm/dart_api_message.cc

Index: runtime/vm/dart_api_message.cc
diff --git a/runtime/vm/dart_api_message.cc b/runtime/vm/dart_api_message.cc
index 88506424740b497fcd2e582129a339f36c4dbd4c..9c12280fd6937c3508a10e8099f1b68d3fe5bb2a 100644
--- a/runtime/vm/dart_api_message.cc
+++ b/runtime/vm/dart_api_message.cc
@@ -206,24 +206,6 @@ Dart_CObject* ApiMessageReader::ReadInlinedObject(intptr_t object_id) {
       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);
@@ -285,6 +267,7 @@ Dart_CObject* ApiMessageReader::ReadObjectRef() {
     AddBackRef(object_id, value, kIsNotDeserialized);
     return value;
   }
+
   intptr_t tags = ReadIntptrValue();
   USE(tags);
 
@@ -390,6 +373,28 @@ Dart_CObject* ApiMessageReader::ReadInternalVMObject(intptr_t class_id,
       }
       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();