Fix for issue 6311 (serialize the right type).

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/symbols.h"
 #include "vm/visitor.h"
@@ skipping 2095 matching lines @@
       reader->isolate()->object_store()->external_##lname##_array_class());    \
   return NewExternalImpl<External##name##Array, RawExternal##name##Array>(     \
       cls, data, length, peer, callback, HEAP_SPACE(kind));                    \
 }                                                                              \
 
 
 BYTEARRAY_TYPE_LIST(EXTERNALARRAY_READ_FROM)
 #undef EXTERNALARRAY_READ_FROM
 
 
+template<typename ElementT>
 static void ByteArrayWriteTo(SnapshotWriter* writer,
                              intptr_t object_id,
                              Snapshot::Kind kind,
                              intptr_t byte_array_kind,
                              intptr_t tags,
                              RawSmi* length,
-                             uint8_t* data) {
+                             ElementT* 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(byte_array_kind);
   writer->WriteIntptrValue(tags);
 
@@ skipping 17 matching lines @@
 #define BYTEARRAY_WRITE_TO(name, lname, type)                                  \
 void Raw##name##Array::WriteTo(SnapshotWriter* writer,                         \
                                intptr_t object_id,                             \
                                Snapshot::Kind kind) {                          \
   ByteArrayWriteTo(writer,                                                     \
                    object_id,                                                  \
                    kind,                                                       \
                    k##name##ArrayCid,                                          \
                    writer->GetObjectTags(this),                                \
                    ptr()->length_,                                             \
-                   reinterpret_cast<uint8_t*>(ptr()->data_));                  \
+                   ptr()->data_);                                              \
 }                                                                              \
 
 
 BYTEARRAY_TYPE_LIST(BYTEARRAY_WRITE_TO)
 #undef BYTEARRAY_WRITE_TO
 
 
 #define EXTERNALARRAY_WRITE_TO(name, lname, type)                              \
 void RawExternal##name##Array::WriteTo(SnapshotWriter* writer,                 \
                                        intptr_t object_id,                     \
                                        Snapshot::Kind kind) {                  \
   ByteArrayWriteTo(writer,                                                     \
                    object_id,                                                  \
                    kind,                                                       \
                    k##name##ArrayCid,                                          \
                    writer->GetObjectTags(this),                                \
                    ptr()->length_,                                             \
-                   reinterpret_cast<uint8_t*>(ptr()->external_data_->data())); \
+                   ptr()->external_data_->data());                             \
 }                                                                              \
 
 
 BYTEARRAY_TYPE_LIST(EXTERNALARRAY_WRITE_TO)
 #undef BYTEARRAY_WRITE_TO
 #undef BYTEARRAY_TYPE_LIST
 
 
 RawDartFunction* DartFunction::ReadFrom(SnapshotReader* reader,
                                         intptr_t object_id,
@@ skipping 117 matching lines @@
   // Write out the class and tags information.
   writer->WriteIndexedObject(kWeakPropertyCid);
   writer->WriteIntptrValue(writer->GetObjectTags(this));
 
   // Write out all the other fields.
   writer->Write<RawObject*>(ptr()->key_);
   writer->Write<RawObject*>(ptr()->value_);
 }
 
 }  // namespace dart