- Canonicalize types, type_arguments only when the object is marked as being from the core librarie…

runtime/vm/raw_object_snapshot.cc

Index: runtime/vm/raw_object_snapshot.cc
===================================================================
--- runtime/vm/raw_object_snapshot.cc	(revision 20396)
+++ runtime/vm/raw_object_snapshot.cc	(working copy)
@@ -205,8 +205,11 @@
   }
 
   // If object needs to be a canonical object, Canonicalize it.
-  if ((kind != Snapshot::kFull) && RawObject::IsCanonical(tags)) {
-    type ^= type.Canonicalize();
+  if (RawObject::IsCanonical(tags)) {

[Ivan Posva, 2013/03/22 21:17:22]

This follows complicated rules and uses information known to be present at the
time the snapshot was created. Please add a comment.

[siva, 2013/03/22 22:33:19]

Added a comment detailing each case (Full, Script and message).

On 2013/03/22 21:17:22, Ivan Posva wrote:

+    if ((kind == Snapshot::kScript && RawObject::IsCreatedFromSnapshot(tags)) ||
+        (kind == Snapshot::kMessage)) {
+      type ^= type.Canonicalize();
+    }
   }
 
   // Set the object tags (This is done after 'Canonicalize', which
@@ -458,8 +461,11 @@
   }
 
   // If object needs to be a canonical object, Canonicalize it.
-  if ((kind != Snapshot::kFull) && RawObject::IsCanonical(tags)) {
-    type_arguments ^= type_arguments.Canonicalize();
+  if (RawObject::IsCanonical(tags)) {

[Ivan Posva, 2013/03/22 21:17:22]

ditto

[siva, 2013/03/22 22:33:19]

Done.

+    if ((kind == Snapshot::kScript && RawObject::IsCreatedFromSnapshot(tags)) ||
+        (kind == Snapshot::kMessage)) {
+      type_arguments ^= type_arguments.Canonicalize();
+    }
   }
 
   // Set the object tags (This is done after setting the object fields
@@ -1597,7 +1603,9 @@
   if (kind == Snapshot::kFull) {
     mint = reader->NewMint(value);
   } else {
-    if (RawObject::IsCanonical(tags)) {
+    if (RawObject::IsCanonical(tags) &&

[Ivan Posva, 2013/03/22 21:17:22]

ditto

[siva, 2013/03/22 22:33:19]

Done.

+        (RawObject::IsCreatedFromSnapshot(tags) ||
+         (kind == Snapshot::kMessage))) {
       mint = Mint::NewCanonical(value);
     } else {
       mint = Mint::New(value, HEAP_SPACE(kind));
@@ -1648,8 +1656,11 @@
        BigintOperations::FromHexCString(str, HEAP_SPACE(kind))));
 
   // If it is a canonical constant make it one.
-  if ((kind != Snapshot::kFull) && RawObject::IsCanonical(tags)) {
-    obj ^= obj.Canonicalize();
+  if (RawObject::IsCanonical(tags)) {

[Ivan Posva, 2013/03/22 21:17:22]

ditto.

[siva, 2013/03/22 22:33:19]

Done.

+    if ((kind == Snapshot::kScript && RawObject::IsCreatedFromSnapshot(tags)) ||
+        (kind == Snapshot::kMessage)) {
+      obj ^= obj.Canonicalize();
+    }
   }
   reader->AddBackRef(object_id, &obj, kIsDeserialized);
 
@@ -1715,7 +1726,9 @@
   if (kind == Snapshot::kFull) {
     dbl = reader->NewDouble(value);
   } else {
-    if (RawObject::IsCanonical(tags)) {
+    if (RawObject::IsCanonical(tags) &&

[Ivan Posva, 2013/03/22 21:17:22]

ditto

[siva, 2013/03/22 22:33:19]

Done.

+        (RawObject::IsCreatedFromSnapshot(tags) ||
+         (kind == Snapshot::kMessage))) {
       dbl = Double::NewCanonical(value);
     } else {
       dbl = Double::New(value, HEAP_SPACE(kind));