- Use a hash table to canonicalize instances/arrays to avoid having to iterate over a linear list a…

runtime/vm/raw_object_snapshot.cc

Index: runtime/vm/raw_object_snapshot.cc
diff --git a/runtime/vm/raw_object_snapshot.cc b/runtime/vm/raw_object_snapshot.cc
index 0ca54d8f33c2282146cd312db1cc2547aa36f4cf..1cefa03f4b5daf0745cce757ca2151f31145026d 100644
--- a/runtime/vm/raw_object_snapshot.cc
+++ b/runtime/vm/raw_object_snapshot.cc
@@ -2293,7 +2293,7 @@ RawInstance* Instance::ReadFrom(SnapshotReader* reader,
                             Instance::InstanceSize(),
                             HEAP_SPACE(kind));
     if (RawObject::IsCanonical(tags)) {
-      obj = obj.CheckAndCanonicalize(NULL);
+      obj = obj.CheckAndCanonicalize(reader->thread(), NULL);
     }
   }
   reader->AddBackRef(object_id, &obj, kIsDeserialized);
@@ -2404,7 +2404,7 @@ RawBigint* Bigint::ReadFrom(SnapshotReader* reader,
       // Set the canonical bit.
       obj.SetCanonical();
     } else {
-      obj ^= obj.CheckAndCanonicalize(NULL);
+      obj ^= obj.CheckAndCanonicalize(reader->thread(), NULL);
       ASSERT(!obj.IsNull());
       ASSERT(obj.IsCanonical());
     }
@@ -2831,7 +2831,7 @@ RawImmutableArray* ImmutableArray::ReadFrom(SnapshotReader* reader,
       if (kind == Snapshot::kFull) {
         array->SetCanonical();
       } else {
-        *array ^= array->CheckAndCanonicalize(NULL);
+        *array ^= array->CheckAndCanonicalize(reader->thread(), NULL);
       }
     }
   }
@@ -3247,7 +3247,7 @@ RawTypedData* TypedData::ReadFrom(SnapshotReader* reader,
       // Set the canonical bit.
       result.SetCanonical();
     } else {
-      result ^= result.CheckAndCanonicalize(NULL);
+      result ^= result.CheckAndCanonicalize(reader->thread(), NULL);
       ASSERT(!result.IsNull());
       ASSERT(result.IsCanonical());
     }