Canonicalize TypeArguments.

runtime/vm/raw_object_snapshot.cc

 // Copyright (c) 2011, 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/bigint_operations.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/snapshot.h"
 #include "vm/visitor.h"
 
@@ skipping 282 matching lines @@
 
 
 void RawAbstractTypeArguments::WriteTo(SnapshotWriter* writer,
                                intptr_t object_id,
                                bool serialize_classes) {
   UNREACHABLE();  // AbstractTypeArguments is an abstract class.
 }
 
 
 RawTypeArguments* TypeArguments::ReadFrom(SnapshotReader* reader,
-                                  intptr_t object_id,
-                                  bool classes_serialized) {
+                                          intptr_t object_id,
+                                          bool classes_serialized) {
   ASSERT(reader != NULL);
 
   // Read the length so that we can determine instance size to allocate.
   RawSmi* smi_len = GetSmi(reader->Read<intptr_t>());
   intptr_t len = Smi::Value(smi_len);
+  Bool& is_canonical = Bool::Handle();
+  is_canonical ^= reader->ReadObject();
 
-  TypeArguments& type_array = TypeArguments::Handle(TypeArguments::New(len));
-  reader->AddBackwardReference(object_id, &type_array);
+  TypeArguments& type_arguments =
+      TypeArguments::Handle(TypeArguments::New(len));
+  type_arguments.set_is_canonical(is_canonical.raw() == Bool::True());
+  reader->AddBackwardReference(object_id, &type_arguments);
   AbstractType& type = AbstractType::Handle();
   for (intptr_t i = 0; i < len; i++) {
     type ^= reader->ReadObject();
-    type_array.SetTypeAt(i, type);
+    type_arguments.SetTypeAt(i, type);
   }
-  return type_array.raw();
+  return type_arguments.raw();
 }
 
 
 void RawTypeArguments::WriteTo(SnapshotWriter* writer,
                                intptr_t object_id,
                                bool serialize_classes) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteObjectHeader(kInlined, object_id);
 
   // Write out the class information.
   writer->WriteObjectHeader(kObjectId, Object::kTypeArgumentsClass);
 
   // Write out the length field.
   writer->Write<RawObject*>(ptr()->length_);
+  writer->WriteObject(ptr()->is_canonical_);
 
   // Write out the individual types.
   intptr_t len = Smi::Value(ptr()->length_);
   for (intptr_t i = 0; i < len; i++) {
     writer->WriteObject(ptr()->types_[i]);
   }
 }
 
 
 RawInstantiatedTypeArguments* InstantiatedTypeArguments::ReadFrom(
@@ skipping 1040 matching lines @@
   // Write out all the other fields.
   writer->Write<RawObject*>(ptr()->num_bracket_expressions_);
   writer->WriteObject(ptr()->pattern_);
   writer->Write<intptr_t>(ptr()->type_);
   writer->Write<intptr_t>(ptr()->flags_);
 
   // Do not write out the data part which is native.
 }
 
 }  // namespace dart