Split GuardField into GuardFieldType and GuardFieldLength instructions.

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 d2ce0dfc89276a40028cec3bcb91f163d5d367e5..e6eacffc0f9bdc523679b6db7bc32f24f36ee392 100644
--- a/runtime/vm/raw_object_snapshot.cc
+++ b/runtime/vm/raw_object_snapshot.cc
@@ -773,6 +773,7 @@ RawField* Field::ReadFrom(SnapshotReader* reader,
   field.set_token_pos(reader->ReadIntptrValue());
   field.set_guarded_cid(reader->ReadIntptrValue());
   field.set_is_nullable(reader->ReadIntptrValue());
+  field.set_guarded_list_length_in_object_offset(reader->ReadIntptrValue());
   field.set_kind_bits(reader->Read<uint8_t>());
 
   // Set all the object fields.
@@ -806,6 +807,7 @@ void RawField::WriteTo(SnapshotWriter* writer,
   writer->WriteIntptrValue(ptr()->token_pos_);
   writer->WriteIntptrValue(ptr()->guarded_cid_);
   writer->WriteIntptrValue(ptr()->is_nullable_);
+  writer->WriteIntptrValue(ptr()->guarded_list_length_in_object_offset_);

[Cutch, 2014/05/28 14:13:31]

Do we want to write this? The offset isn't compatible between 32-bit and 64-bit
platforms, right?

[Vyacheslav Egorov (Google), 2014/05/29 17:36:51]

Done.

   writer->Write<uint8_t>(ptr()->kind_bits_);
 
   // Write out all the object pointer fields.