Fix dartbug.com/15963:

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/symbols.h"
 #include "vm/visitor.h"
@@ skipping 1666 matching lines @@
                              intptr_t object_id,
                              Snapshot::Kind kind) {
   UNREACHABLE();
 }
 
 
 RawInstance* Instance::ReadFrom(SnapshotReader* reader,
                                 intptr_t object_id,
                                 intptr_t tags,
                                 Snapshot::Kind kind) {
-  UNREACHABLE();
-  return Instance::null();
+  ASSERT(reader != NULL);
+
+  // Create an Instance object or get canonical one if it is a canonical
+  // constant.
+  Instance& obj = Instance::ZoneHandle(reader->isolate(), Instance::null());
+  if (kind == Snapshot::kFull) {
+    obj = reader->NewInstance();
+  } else {
+    obj ^= Object::Allocate(kInstanceCid,
+                            Instance::InstanceSize(),
+                            HEAP_SPACE(kind));
+    // When reading a script snapshot we need to canonicalize only those object
+    // references that are objects from the core library (loaded from a
+    // full snapshot). Objects that are only in the script need not be
+    // canonicalized as they are already canonical.
+    // When reading a message snapshot we always have to canonicalize.
+    if (RawObject::IsCanonical(tags) &&
+        (RawObject::IsCreatedFromSnapshot(tags) ||
+         (kind == Snapshot::kMessage))) {
+      obj = obj.CheckAndCanonicalize(NULL);
+    }
+  }
+  reader->AddBackRef(object_id, &obj, kIsDeserialized);
+
+  // Set the object tags.
+  obj.set_tags(tags);
+
+  return obj.raw();
 }
 
 
 void RawInstance::WriteTo(SnapshotWriter* writer,
                           intptr_t object_id,
                           Snapshot::Kind kind) {
-  UNREACHABLE();
+  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));
 }
 
 
 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 848 matching lines @@
     array ^= reader->ReadObjectRef();
     result.set_code_array(array);
     array ^= reader->ReadObjectRef();
     result.set_pc_offset_array(array);
 
     array ^= reader->ReadObjectRef();
     result.set_catch_code_array(array);
     array ^= reader->ReadObjectRef();
     result.set_catch_pc_offset_array(array);
 
+    bool expand_inlined = reader->Read<bool>();
+    result.set_expand_inlined(expand_inlined);
+
     return result.raw();
   }
   UNREACHABLE();  // Stacktraces are not sent in a snapshot.
   return Stacktrace::null();
 }
 
 
 void RawStacktrace::WriteTo(SnapshotWriter* writer,
                             intptr_t object_id,
                             Snapshot::Kind kind) {
   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));
 
-    // There are no non object pointer fields.
-
     // Write out all the object pointer fields.
     SnapshotWriterVisitor visitor(writer);
     visitor.VisitPointers(from(), to());
+
+    writer->Write(expand_inlined_);
   } else {
     // Stacktraces are not allowed in other snapshot forms.
     writer->SetWriteException(Exceptions::kArgument,
                               "Illegal argument in isolate message"
                               " : (object is a stacktrace)");
   }
 }
 
 
 RawJSRegExp* JSRegExp::ReadFrom(SnapshotReader* reader,
@@ skipping 109 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 MirrorReference)");
   } else {
     UNREACHABLE();
   }
 }
 
 }  // namespace dart