Finishes removing intptr_t from raw object fields.

runtime/vm/dart_api_message.cc

Index: runtime/vm/dart_api_message.cc
===================================================================
--- runtime/vm/dart_api_message.cc	(revision 37464)
+++ runtime/vm/dart_api_message.cc	(working copy)
@@ -257,8 +257,8 @@
 
 Dart_CObject* ApiMessageReader::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>();
   USE(tags);
   intptr_t class_id;
 
@@ -400,7 +400,7 @@
   }
   ASSERT(SerializedHeaderTag::decode(value) == kInlined);
   // Read the class header information and lookup the class.
-  intptr_t class_header = ReadIntptrValue();
+  intptr_t class_header = Read<int32_t>();
 
   // Reading of regular dart instances has limited support in order to
   // read typed data views.
@@ -426,7 +426,7 @@
     return value;
   }
 
-  intptr_t tags = ReadIntptrValue();
+  intptr_t tags = Read<int32_t>();
   USE(tags);
 
   return ReadInternalVMObject(class_id, object_id);
@@ -489,9 +489,9 @@
       // TODO(sgjesse): Fix this workaround ignoring the type parameter.
       Dart_CObject* value = &dynamic_type_marker;
       AddBackRef(object_id, value, kIsDeserialized);
-      intptr_t index = ReadIntptrValue();
+      intptr_t index = Read<int32_t>();
       USE(index);
-      intptr_t token_index = ReadIntptrValue();
+      intptr_t token_index = Read<int32_t>();
       USE(token_index);
       int8_t type_state = Read<int8_t>();
       USE(type_state);
@@ -515,7 +515,7 @@
     }
     case kBigintCid: {
       // Read in the hex string representation of the bigint.
-      intptr_t len = ReadIntptrValue();
+      intptr_t len = Read<int32_t>();
       Dart_CObject* object = AllocateDartCObjectBigint(len);
       AddBackRef(object_id, object, kIsDeserialized);
       char* p = object->value.as_bigint;
@@ -782,7 +782,7 @@
 
   // Write out the class and tags information.
   WriteIndexedObject(kArrayCid);
-  WriteIntptrValue(0);
+  Write<int32_t>(0);
 
   // Write out the length field.
   Write<RawObject*>(Smi::New(field_count));
@@ -878,7 +878,7 @@
   WriteInlinedHeader(object);
   // Write out the class and tags information.
   WriteIndexedObject(kMintCid);
-  WriteIntptrValue(0);
+  Write<int32_t>(0);
   // Write the 64-bit value.
   Write<int64_t>(value);
 }
@@ -933,7 +933,7 @@
     WriteInlinedHeader(object);
     // Write out the class and tags information.
     WriteIndexedObject(kArrayCid);
-    WriteIntptrValue(0);
+    Write<int32_t>(0);
     // Write out the length information.
     WriteSmi(array_length);
     // Write out the type arguments.
@@ -993,7 +993,7 @@
   WriteInlinedObjectHeader(kMaxPredefinedObjectIds + object_id);
   // Write out the class and tags information.
   WriteIndexedObject(kArrayCid);
-  WriteIntptrValue(0);
+  Write<int32_t>(0);
   // Write out the length information.
   WriteSmi(array_length);
   // Write out the type arguments.
@@ -1038,10 +1038,10 @@
       WriteInlinedHeader(object);
       // Write out the class and tags information.
       WriteIndexedObject(kBigintCid);
-      WriteIntptrValue(0);
+      Write<int32_t>(0);
       // Write hex string length and content
       intptr_t len = strlen(hex_string);
-      WriteIntptrValue(len);
+      Write<int32_t>(len);
       for (intptr_t i = 0; i < len; i++) {
         Write<uint8_t>(hex_string[i]);
       }
@@ -1071,7 +1071,7 @@
       // Write out the class and tags information.
       WriteIndexedObject(type == Utf8::kLatin1 ? kOneByteStringCid
                                                : kTwoByteStringCid);
-      WriteIntptrValue(0);
+      Write<int32_t>(0);
       // Write string length, hash and content
       WriteSmi(len);
       WriteSmi(0);  // TODO(sgjesse): Hash - not written.
@@ -1123,7 +1123,7 @@
       }
 
       WriteIndexedObject(class_id);
-      WriteIntptrValue(RawObject::ClassIdTag::update(class_id, 0));
+      Write<int32_t>(RawObject::ClassIdTag::update(class_id, 0));
       WriteSmi(len);
       uint8_t* bytes = object->value.as_typed_data.values;
       for (intptr_t i = 0; i < len; i++) {
@@ -1141,7 +1141,7 @@
       WriteInlinedHeader(object);
       // Write out the class and tag information.
       WriteIndexedObject(kExternalTypedDataUint8ArrayCid);
-      WriteIntptrValue(RawObject::ClassIdTag::update(
+      Write<int32_t>(RawObject::ClassIdTag::update(
           kExternalTypedDataUint8ArrayCid, 0));
       intptr_t length = object->value.as_external_typed_data.length;
       if (length < 0 ||