Fix issue with serializing typed array views

runtime/vm/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/snapshot.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/class_finalizer.h"
@@ skipping 962 matching lines @@
     WriteInlinedObjectHeader(object_id);
 
     // Write out the class information.
     WriteIndexedObject(kImmutableArrayCid);
 
     // Write out the length field.
     Write<RawObject*>(rawarray->ptr()->length_);
 
     return;
   }
+  if (RawObject::IsTypedDataViewClassId(class_id)) {
+    WriteInstanceRef(raw, cls);
+    return;
+  }
   // Object is being referenced, add it to the forward ref list and mark
   // it so that future references to this object in the snapshot will use
   // this object id. Mark it as not having been serialized yet so that we
   // will serialize the object when we go through the forward list.
   intptr_t object_id = MarkObject(raw, kIsSerialized);
   switch (class_id) {
 #define SNAPSHOT_WRITE(clazz)                                                  \
     case clazz::kClassId: {                                                    \
       Raw##clazz* raw_obj = reinterpret_cast<Raw##clazz*>(raw);                \
       raw_obj->WriteTo(this, object_id, kind_);                                \
@@ skipping 19 matching lines @@
         reinterpret_cast<RawExternalTypedData*>(raw);
       raw_obj->WriteTo(this, object_id, kind_);
       return;
     }
 #undef SNAPSHOT_WRITE
 #define SNAPSHOT_WRITE(clazz)                                                  \
     case kTypedData##clazz##ViewCid:                                           \
 
     CLASS_LIST_TYPED_DATA(SNAPSHOT_WRITE)
     case kByteDataViewCid: {
-      WriteInstanceRef(raw, cls);
+      // Handled above.
+      UNREACHABLE();
       return;
     }
 #undef SNAPSHOT_WRITE

[siva, 2013/04/09 21:15:12]

Do we need this set of case statements for typedata view classes considering you
have handled them above. I suppose we could remove them as we will fall through
and hit UNREACHABLE().

[Søren Gjesse, 2013/04/10 13:25:20]

Yes, of cause. Done.

     default: break;
   }
   UNREACHABLE();
 }
 
 
 void FullSnapshotWriter::WriteFullSnapshot() {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   ObjectStore* object_store = isolate->object_store();
@@ skipping 45 matching lines @@
 
 
 intptr_t SnapshotWriter::MarkObject(RawObject* raw, SerializeState state) {
   NoGCScope no_gc;
   intptr_t object_id = forward_list_.length() + kMaxPredefinedObjectIds;
   ASSERT(object_id <= kMaxObjectId);
   uword value = 0;
   value = SerializedHeaderTag::update(kObjectId, value);
   value = SerializedHeaderData::update(object_id, value);
   uword tags = raw->ptr()->tags_;
+  ASSERT(SerializedHeaderTag::decode(tags) != kObjectId);
   raw->ptr()->tags_ = value;
   ForwardObjectNode* node = new ForwardObjectNode(raw, tags, state);
   ASSERT(node != NULL);
   forward_list_.Add(node);
   return object_id;
 }
 
 
 void SnapshotWriter::UnmarkAll() {
   NoGCScope no_gc;
@@ skipping 365 matching lines @@
     UnmarkAll();
     isolate->set_long_jump_base(base);
   } else {
     isolate->set_long_jump_base(base);
     ThrowException(exception_type(), exception_msg());
   }
 }
 
 
 }  // namespace dart