Finishes removing intptr_t from raw object fields.

runtime/vm/snapshot.cc

Index: runtime/vm/snapshot.cc
===================================================================
--- runtime/vm/snapshot.cc	(revision 37464)
+++ runtime/vm/snapshot.cc	(working copy)
@@ -130,7 +130,7 @@
 
 
 RawSmi* BaseReader::ReadAsSmi() {
-  intptr_t value = ReadIntptrValue();
+  intptr_t value = Read<int32_t>();
   ASSERT((value & kSmiTagMask) == kSmiTag);
   return reinterpret_cast<RawSmi*>(value);
 }
@@ -192,7 +192,7 @@
 RawClass* SnapshotReader::ReadClassId(intptr_t object_id) {
   ASSERT(kind_ != Snapshot::kFull);
   // Read the class header information and lookup the class.
-  intptr_t class_header = ReadIntptrValue();
+  intptr_t class_header = Read<int32_t>();
   ASSERT((class_header & kSmiTagMask) != kSmiTag);
   ASSERT(!IsVMIsolateObject(class_header) ||
          !IsSingletonClassId(GetVMIsolateObjectId(class_header)));
@@ -251,7 +251,7 @@
   ASSERT(GetBackRef(object_id) == NULL);
 
   // Read the class header information and lookup the class.
-  intptr_t class_header = ReadIntptrValue();
+  intptr_t class_header = Read<int32_t>();
 
   // Since we are only reading an object reference, If it is an instance kind
   // then we only need to figure out the class of the object and allocate an
@@ -302,7 +302,7 @@
   }
 
   // For all other internal VM classes we read the object inline.
-  intptr_t tags = ReadIntptrValue();
+  intptr_t tags = Read<int32_t>();
   switch (class_id) {
 #define SNAPSHOT_READ(clazz)                                                   \
     case clazz::kClassId: {                                                    \
@@ -811,8 +811,8 @@
 
 RawObject* SnapshotReader::ReadInlinedObject(intptr_t object_id) {
   // Read the class header information and lookup the class.
-  intptr_t class_header = ReadIntptrValue();
-  intptr_t tags = ReadIntptrValue();
+  intptr_t class_header = Read<int32_t>();
+  intptr_t tags = Read<int32_t>();
   if (SerializedHeaderData::decode(class_header) == kInstanceObjectId) {
     // Object is regular dart instance.
     Instance* result = reinterpret_cast<Instance*>(GetBackRef(object_id));
@@ -1388,7 +1388,7 @@
   // case.
   // Write out the class and tags information.
   WriteVMIsolateObject(kClassCid);
-  WriteIntptrValue(GetObjectTags(cls));
+  Write<int32_t>(GetObjectTags(cls));
 
   // Write out the library url and class name.
   RawLibrary* library = cls->ptr()->library_;
@@ -1411,7 +1411,7 @@
 
   // Write out the class and tags information.
   WriteIndexedObject(array_kind);
-  WriteIntptrValue(tags);
+  Write<int32_t>(tags);
 
   // Write out the length field.
   Write<RawObject*>(length);
@@ -1468,10 +1468,10 @@
   WriteInlinedObjectHeader(object_id);
 
   // Indicate this is an instance object.
-  WriteIntptrValue(SerializedHeaderData::encode(kInstanceObjectId));
+  Write<int32_t>(SerializedHeaderData::encode(kInstanceObjectId));
 
   // Write out the tags.
-  WriteIntptrValue(tags);
+  Write<int32_t>(tags);
 
   // Write out the class information for this object.
   WriteObjectImpl(cls);
@@ -1503,7 +1503,7 @@
   WriteInlinedObjectHeader(object_id);
 
   // Indicate this is an instance object.
-  WriteIntptrValue(SerializedHeaderData::encode(kInstanceObjectId));
+  Write<int32_t>(SerializedHeaderData::encode(kInstanceObjectId));
 
   // Write out the class information for this object.
   WriteObjectImpl(cls);