Omits size bits when writing RawObject tags to a snapshot.

runtime/vm/raw_object_snapshot.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/bigint_operations.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/snapshot.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
@@ skipping 79 matching lines @@
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   if ((kind == Snapshot::kFull) ||
       (kind == Snapshot::kScript &&
        !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this)))) {
     // Write out the class and tags information.
     writer->WriteVMIsolateObject(kClassCid);
-    writer->WriteIntptrValue(writer->GetObjectTags(this));
+    writer->WriteTags(writer->GetObjectTags(this));
 
     // Write out all the non object pointer fields.
     // NOTE: cpp_vtable_ is not written.
     int32_t class_id = ptr()->id_;
     writer->Write<int32_t>(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->Write<int32_t>(ptr()->instance_size_in_words_);
@@ skipping 49 matching lines @@
 void RawUnresolvedClass::WriteTo(SnapshotWriter* writer,
                                  intptr_t object_id,
                                  Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kUnresolvedClassCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the non object pointer fields.
   writer->Write<int32_t>(ptr()->token_pos_);
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
 
@@ skipping 65 matching lines @@
 
   // Only resolved and finalized types should be written to a snapshot.
   ASSERT((ptr()->type_state_ == RawType::kFinalizedInstantiated) ||
          (ptr()->type_state_ == RawType::kFinalizedUninstantiated));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kTypeCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the non object pointer fields.
   writer->Write<int32_t>(ptr()->token_pos_);
   writer->Write<int8_t>(ptr()->type_state_);
 
   // Write out all the object pointer fields. Since we will be canonicalizing
   // the type object when reading it back we should write out all the fields
   // inline and not as references.
   SnapshotWriterVisitor visitor(writer, false);
   visitor.VisitPointers(from(), to());
@@ skipping 31 matching lines @@
 void RawTypeRef::WriteTo(SnapshotWriter* writer,
                          intptr_t object_id,
                          Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kTypeRefCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
 
 RawTypeParameter* TypeParameter::ReadFrom(SnapshotReader* reader,
                                           intptr_t object_id,
                                           intptr_t tags,
@@ skipping 34 matching lines @@
   ASSERT(writer != NULL);
 
   // Only finalized type parameters should be written to a snapshot.
   ASSERT(ptr()->type_state_ == RawTypeParameter::kFinalizedUninstantiated);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kTypeParameterCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the non object pointer fields.
   writer->Write<int32_t>(ptr()->index_);
   writer->Write<int32_t>(ptr()->token_pos_);
   writer->Write<int8_t>(ptr()->type_state_);
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
@@ skipping 31 matching lines @@
 void RawBoundedType::WriteTo(SnapshotWriter* writer,
                              intptr_t object_id,
                              Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kBoundedTypeCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
 
 RawMixinAppType* MixinAppType::ReadFrom(SnapshotReader* reader,
                                         intptr_t object_id,
                                         intptr_t tags,
@@ skipping 64 matching lines @@
 void RawTypeArguments::WriteTo(SnapshotWriter* writer,
                                intptr_t object_id,
                                Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kTypeArgumentsCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out the length field.
   writer->Write<RawObject*>(ptr()->length_);
 
   // Write out the instantiations field, but only in a full snapshot.
   if (kind == Snapshot::kFull) {
     writer->WriteObjectImpl(ptr()->instantiations_);
   }
 
   // Write out the individual types.
@@ skipping 39 matching lines @@
   ASSERT(writer != NULL);
   ASSERT(((kind == Snapshot::kScript) &&
           !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
          (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kPatchClassCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
 
 RawClosureData* ClosureData::ReadFrom(SnapshotReader* reader,
                                       intptr_t object_id,
                                       intptr_t tags,
                                       Snapshot::Kind kind) {
@@ skipping 28 matching lines @@
   ASSERT(writer != NULL);
   ASSERT(((kind == Snapshot::kScript) &&
           !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
          (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kClosureDataCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Context scope.
   // We don't write the context scope in the snapshot.
   writer->WriteObjectImpl(Object::null());
 
   // Parent function.
   writer->WriteObjectImpl(ptr()->parent_function_);
 
   // Signature class.
   writer->WriteObjectImpl(ptr()->signature_class_);
@@ skipping 39 matching lines @@
   ASSERT(writer != NULL);
   ASSERT(((kind == Snapshot::kScript) &&
           !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
          (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kRedirectionDataCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
 
 RawFunction* Function::ReadFrom(SnapshotReader* reader,
                                 intptr_t object_id,
                                 intptr_t tags,
@@ skipping 43 matching lines @@
   ASSERT(writer != NULL);
   ASSERT(((kind == Snapshot::kScript) &&
           !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
          (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kFunctionCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the non object fields.
   writer->Write<int32_t>(ptr()->token_pos_);
   writer->Write<int32_t>(ptr()->end_token_pos_);
   writer->Write<int32_t>(ptr()->usage_counter_);
   writer->Write<int16_t>(ptr()->num_fixed_parameters_);
   writer->Write<int16_t>(ptr()->num_optional_parameters_);
   writer->Write<int16_t>(ptr()->deoptimization_counter_);
   writer->Write<uint16_t>(ptr()->kind_tag_);
   writer->Write<uint16_t>(ptr()->optimized_instruction_count_);
@@ skipping 47 matching lines @@
   ASSERT(writer != NULL);
   ASSERT(((kind == Snapshot::kScript) &&
           !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
          (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kFieldCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the non object fields.
   writer->Write<int32_t>(ptr()->token_pos_);
   writer->Write<int32_t>(ptr()->guarded_cid_);
   writer->Write<int32_t>(ptr()->is_nullable_);
   writer->Write<uint8_t>(ptr()->kind_bits_);
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
@@ skipping 31 matching lines @@
                               intptr_t object_id,
                               Snapshot::Kind kind) {
   ASSERT(writer != NULL);
   ASSERT(kind != Snapshot::kMessage);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kLiteralTokenCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out the kind field.
   writer->Write<intptr_t>(ptr()->kind_);
 
   // Write out literal and value fields.
   writer->WriteObjectImpl(ptr()->literal_);
   writer->WriteObjectImpl(ptr()->value_);
 }
 
 
@@ skipping 42 matching lines @@
   ASSERT(writer != NULL);
   ASSERT(((kind == Snapshot::kScript) &&
           !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
          (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kTokenStreamCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out the length field and the token stream.
   RawExternalTypedData* stream = ptr()->stream_;
   intptr_t len = Smi::Value(stream->ptr()->length_);
   writer->Write<RawObject*>(stream->ptr()->length_);
   writer->WriteBytes(stream->ptr()->data_, len);
 
   // Write out the literal/identifier token array.
   writer->WriteObjectImpl(ptr()->token_objects_);
   // Write out the private key in use by the token stream.
@@ skipping 43 matching lines @@
   ASSERT(tokens_ != TokenStream::null());
   ASSERT(((kind == Snapshot::kScript) &&
           !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
          (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kScriptCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the object pointer fields.
   writer->WriteObjectImpl(ptr()->url_);
   writer->WriteObjectImpl(ptr()->tokens_);
 
   writer->Write<int32_t>(ptr()->line_offset_);
   writer->Write<int32_t>(ptr()->col_offset_);
   writer->Write<int8_t>(ptr()->kind_);
 }
 
@@ skipping 60 matching lines @@
                          intptr_t object_id,
                          Snapshot::Kind kind) {
   ASSERT(writer != NULL);
   ASSERT(kind != Snapshot::kMessage);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kLibraryCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   if ((kind == Snapshot::kScript) &&
       RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) {
     ASSERT(kind != Snapshot::kFull);
     // Write out library URL so that it can be looked up when reading.
     writer->WriteObjectImpl(ptr()->url_);
   } else {
     // Write out all non object fields.
     writer->Write<int32_t>(ptr()->index_);
     writer->Write<int32_t>(ptr()->num_imports_);
@@ skipping 59 matching lines @@
   ASSERT(writer != NULL);
   ASSERT(((kind == Snapshot::kScript) &&
           !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
          (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kLibraryPrefixCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all non object fields.
   writer->Write<int32_t>(ptr()->num_imports_);
   writer->Write<bool>(ptr()->is_deferred_load_);
   writer->Write<bool>(ptr()->is_loaded_);
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
@@ skipping 34 matching lines @@
   ASSERT(writer != NULL);
   ASSERT(((kind == Snapshot::kScript) &&
           !RawObject::IsCreatedFromSnapshot(writer->GetObjectTags(this))) ||
          (kind == Snapshot::kFull));
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kNamespaceCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
 
 RawCode* Code::ReadFrom(SnapshotReader* reader,
                         intptr_t object_id,
                         intptr_t tags,
@@ skipping 147 matching lines @@
 void RawContext::WriteTo(SnapshotWriter* writer,
                          intptr_t object_id,
                          Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kContextCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out num of variables in the context.
   writer->WriteIntptrValue(ptr()->num_variables_);
 
   // Can't serialize the isolate pointer, we set it implicitly on read.
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to(ptr()->num_variables_));
 }
@@ skipping 110 matching lines @@
 void RawApiError::WriteTo(SnapshotWriter* writer,
                           intptr_t object_id,
                           Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kApiErrorCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
 
 RawLanguageError* LanguageError::ReadFrom(SnapshotReader* reader,
                                           intptr_t object_id,
                                           intptr_t tags,
@@ skipping 30 matching lines @@
 void RawLanguageError::WriteTo(SnapshotWriter* writer,
                                intptr_t object_id,
                                Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteVMIsolateObject(kLanguageErrorCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the non object fields.
   writer->Write<int32_t>(ptr()->token_pos_);
   writer->Write<uint8_t>(ptr()->kind_);
 
   // Write out all the object pointer fields.
   SnapshotWriterVisitor visitor(writer);
   visitor.VisitPointers(from(), to());
 }
 
@@ skipping 68 matching lines @@
 void RawInstance::WriteTo(SnapshotWriter* writer,
                           intptr_t object_id,
                           Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kInstanceCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 }
 
 
 RawMint* Mint::ReadFrom(SnapshotReader* reader,
                         intptr_t object_id,
                         intptr_t tags,
                         Snapshot::Kind kind) {
   ASSERT(reader != NULL);
 
   // Read the 64 bit value for the object.
@@ skipping 29 matching lines @@
 void RawMint::WriteTo(SnapshotWriter* writer,
                       intptr_t object_id,
                       Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kMintCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out the 64 bit value.
   writer->Write<int64_t>(ptr()->value_);
 }
 
 
 RawBigint* Bigint::ReadFrom(SnapshotReader* reader,
                             intptr_t object_id,
                             intptr_t tags,
                             Snapshot::Kind kind) {
@@ skipping 37 matching lines @@
 void RawBigint::WriteTo(SnapshotWriter* writer,
                         intptr_t object_id,
                         Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kBigintCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out the bigint value as a HEXCstring.
   intptr_t length = ptr()->signed_length_;
   bool is_negative = false;
   if (length <= 0) {
     length = -length;
     is_negative = true;
   }
   uword data_start = reinterpret_cast<uword>(ptr()) + sizeof(RawBigint);
   const char* str = BigintOperations::ToHexCString(
@@ skipping 55 matching lines @@
 void RawDouble::WriteTo(SnapshotWriter* writer,
                         intptr_t object_id,
                         Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kDoubleCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out the double value.
   writer->WriteDouble(ptr()->value_);
 }
 
 
 RawString* String::ReadFrom(SnapshotReader* reader,
                             intptr_t object_id,
                             intptr_t tags,
                             Snapshot::Kind kind) {
@@ skipping 109 matching lines @@
                           RawSmi* hash,
                           T* data) {
   ASSERT(writer != NULL);
   intptr_t len = Smi::Value(length);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(class_id);
-  writer->WriteIntptrValue(tags);
+  writer->WriteTags(tags);
 
   // Write out the length field.
   writer->Write<RawObject*>(length);
 
   // Write out the hash field.
   writer->Write<RawObject*>(hash);
 
   // Write out the string.
   if (len > 0) {
     if (class_id == kOneByteStringCid) {
@@ skipping 195 matching lines @@
 void RawGrowableObjectArray::WriteTo(SnapshotWriter* writer,
                                      intptr_t object_id,
                                      Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kGrowableObjectArrayCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out the used length field.
   writer->Write<RawObject*>(ptr()->length_);
 
   // Write out the Array object.
   writer->WriteObjectImpl(ptr()->data_);
 }
 
 
 RawFloat32x4* Float32x4::ReadFrom(SnapshotReader* reader,
@@ skipping 25 matching lines @@
 void RawFloat32x4::WriteTo(SnapshotWriter* writer,
                            intptr_t object_id,
                            Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kFloat32x4Cid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out the float values.
   writer->Write<float>(ptr()->value_[0]);
   writer->Write<float>(ptr()->value_[1]);
   writer->Write<float>(ptr()->value_[2]);
   writer->Write<float>(ptr()->value_[3]);
 }
 
 
 RawInt32x4* Int32x4::ReadFrom(SnapshotReader* reader,
@@ skipping 25 matching lines @@
 void RawInt32x4::WriteTo(SnapshotWriter* writer,
                          intptr_t object_id,
                          Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kInt32x4Cid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out the mask values.
   writer->Write<uint32_t>(ptr()->value_[0]);
   writer->Write<uint32_t>(ptr()->value_[1]);
   writer->Write<uint32_t>(ptr()->value_[2]);
   writer->Write<uint32_t>(ptr()->value_[3]);
 }
 
 
 RawFloat64x2* Float64x2::ReadFrom(SnapshotReader* reader,
@@ skipping 23 matching lines @@
 void RawFloat64x2::WriteTo(SnapshotWriter* writer,
                            intptr_t object_id,
                            Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kFloat64x2Cid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out the float values.
   writer->Write<double>(ptr()->value_[0]);
   writer->Write<double>(ptr()->value_[1]);
 }
 
 
 #define TYPED_DATA_READ(setter, type)                                          \
   for (intptr_t i = 0; i < length_in_bytes; i += element_size) {               \
     result.Set##setter(i, reader->Read<type>());                               \
@@ skipping 92 matching lines @@
   ASSERT(writer != NULL);
   intptr_t tags = writer->GetObjectTags(this);
   intptr_t cid = ClassIdTag::decode(tags);
   intptr_t len = Smi::Value(ptr()->length_);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(cid);
-  writer->WriteIntptrValue(tags);
+  writer->WriteTags(tags);
 
   // Write out the length field.
   writer->Write<RawObject*>(ptr()->length_);
 
   // Write out the array elements.
   switch (cid) {
     case kTypedDataInt8ArrayCid:
     case kTypedDataUint8ArrayCid:
     case kTypedDataUint8ClampedArrayCid: {
       uint8_t* data = reinterpret_cast<uint8_t*>(ptr()->data());
@@ skipping 34 matching lines @@
   {                                                                            \
     type* data = reinterpret_cast<type*>(ptr()->data_);                        \
     for (intptr_t i = 0; i < len; i++) {                                       \
       writer->Write(data[i]);                                                  \
     }                                                                          \
   }                                                                            \
 
 
 #define EXT_TYPED_DATA_WRITE(cid, type)                                        \
   writer->WriteIndexedObject(cid);                                             \
-  writer->WriteIntptrValue(RawObject::ClassIdTag::update(cid, tags));          \
+  writer->WriteTags(RawObject::ClassIdTag::update(cid, tags));                 \
   writer->Write<RawObject*>(ptr()->length_);                                   \
   TYPED_EXT_DATA_WRITE(type)                                                   \
 
 
 void RawExternalTypedData::WriteTo(SnapshotWriter* writer,
                                    intptr_t object_id,
                                    Snapshot::Kind kind) {
   ASSERT(writer != NULL);
   intptr_t tags = writer->GetObjectTags(this);
   intptr_t cid = ClassIdTag::decode(tags);
@@ skipping 97 matching lines @@
 
 
 void RawSendPort::WriteTo(SnapshotWriter* writer,
                           intptr_t object_id,
                           Snapshot::Kind kind) {
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kSendPortCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   writer->Write(ptr()->id_);
 }
 
 
 RawStacktrace* Stacktrace::ReadFrom(SnapshotReader* reader,
                                     intptr_t object_id,
                                     intptr_t tags,
                                     Snapshot::Kind kind) {
   if (kind == Snapshot::kFull) {
@@ skipping 31 matching lines @@
   if (kind == Snapshot::kFull) {
     ASSERT(writer != NULL);
     ASSERT(this == Isolate::Current()->object_store()->
            preallocated_stack_trace());
 
     // Write out the serialization header value for this object.
     writer->WriteInlinedObjectHeader(object_id);
 
     // Write out the class and tags information.
     writer->WriteIndexedObject(kStacktraceCid);
-    writer->WriteIntptrValue(writer->GetObjectTags(this));
+    writer->WriteTags(writer->GetObjectTags(this));
 
     // Write out all the object pointer fields.
     SnapshotWriterVisitor visitor(writer);
     visitor.VisitPointers(from(), to());
 
     writer->Write(ptr()->expand_inlined_);
   } else {
     // Stacktraces are not allowed in other snapshot forms.
     writer->SetWriteException(Exceptions::kArgument,
                               "Illegal argument in isolate message"
@@ skipping 37 matching lines @@
                           intptr_t object_id,
                           Snapshot::Kind kind) {
   ASSERT(writer != NULL);
   ASSERT(kind == Snapshot::kMessage);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kJSRegExpCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out the data length field.
   writer->Write<RawObject*>(ptr()->data_length_);
 
   // Write out all the other fields.
   writer->Write<RawObject*>(ptr()->num_bracket_expressions_);
   writer->WriteObjectImpl(ptr()->pattern_);
   writer->WriteIntptrValue(ptr()->type_);
   writer->WriteIntptrValue(ptr()->flags_);
 
@@ skipping 26 matching lines @@
 void RawWeakProperty::WriteTo(SnapshotWriter* writer,
                           intptr_t object_id,
                           Snapshot::Kind kind) {
   ASSERT(writer != NULL);
 
   // Write out the serialization header value for this object.
   writer->WriteInlinedObjectHeader(object_id);
 
   // Write out the class and tags information.
   writer->WriteIndexedObject(kWeakPropertyCid);
-  writer->WriteIntptrValue(writer->GetObjectTags(this));
+  writer->WriteTags(writer->GetObjectTags(this));
 
   // Write out all the other fields.
   writer->Write<RawObject*>(ptr()->key_);
   writer->Write<RawObject*>(ptr()->value_);
 }
 
 
 RawMirrorReference* MirrorReference::ReadFrom(SnapshotReader* reader,
                                           intptr_t object_id,
                                           intptr_t tags,
@@ skipping 33 matching lines @@
     // We do not allow objects with native fields in an isolate message.
     writer->SetWriteException(Exceptions::kArgument,
                               "Illegal argument in isolate message"
                               " : (object is a UserTag)");
   } else {
     UNREACHABLE();
   }
 }
 
 }  // namespace dart