Fix snapshot generation to ensure that the snapshot does not contain

runtime/vm/raw_object_snapshot.cc

Index: runtime/vm/raw_object_snapshot.cc
===================================================================
--- runtime/vm/raw_object_snapshot.cc	(revision 28360)
+++ runtime/vm/raw_object_snapshot.cc	(working copy)
@@ -60,7 +60,10 @@
     cls.set_tags(tags);
 
     // Set all non object fields.
-    cls.set_instance_size_in_words(reader->ReadIntptrValue());
+    if (!RawObject::IsInternalVMdefinedClassId(class_id)) {
+      // Instance size of a VM defined class is already set up.
+      cls.set_instance_size_in_words(reader->ReadIntptrValue());
+    }
     cls.set_type_arguments_field_offset_in_words(reader->ReadIntptrValue());
     cls.set_next_field_offset_in_words(reader->ReadIntptrValue());

[Ivan Posva, 2013/10/08 22:33:49]

This should be in sync with the instance size field.

[siva, 2013/10/08 22:50:39]

Done.

     cls.set_num_native_fields(reader->ReadIntptrValue());
@@ -98,8 +101,14 @@
 
     // Write out all the non object pointer fields.
     // NOTE: cpp_vtable_ is not written.
-    writer->WriteIntptrValue(ptr()->id_);
-    writer->WriteIntptrValue(ptr()->instance_size_in_words_);
+    intptr_t class_id = ptr()->id_;
+    writer->WriteIntptrValue(class_id);
+    if (!RawObject::IsInternalVMdefinedClassId(class_id)) {
+      // We don't write the instance size of VM defined classes as they
+      // are already setup during initialization as part of pre populating
+      // the class table.
+      writer->WriteIntptrValue(ptr()->instance_size_in_words_);
+    }
     writer->WriteIntptrValue(ptr()->type_arguments_field_offset_in_words_);
     writer->WriteIntptrValue(ptr()->next_field_offset_in_words_);

[Ivan Posva, 2013/10/08 22:33:49]

ditto

[siva, 2013/10/08 22:50:39]

Done.

     writer->WriteIntptrValue(ptr()->num_native_fields_);