1. Fix the type arguments recursion problem that gets introduced when canonicalization of type argu…

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"
 #include "vm/unicode.h"
 
@@ skipping 750 matching lines @@
 
     case kTypedDataFloat32ArrayCid:
     case kExternalTypedDataFloat32ArrayCid:
       READ_TYPED_DATA(Float32, float);
 
     case kTypedDataFloat64ArrayCid:
     case kExternalTypedDataFloat64ArrayCid:
       READ_TYPED_DATA(Float64, double);
 
     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.
+      // A GrowableObjectArray is serialized as its type arguments and
+      // 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.
+
+      // Read and skip the type arguments field.
+      // TODO(sjesse): Remove this when message serialization format is
+      // 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();
+      }
+
+      // Read the length field.
       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.
@@ skipping 519 matching lines @@
     if (!success) {
       UnmarkAllCObjects(object);
       return false;
     }
   }
   UnmarkAllCObjects(object);
   return true;
 }
 
 }  // namespace dart