Changes to create an application snapshot which can be layered on top

vm/snapshot.cc

 // Copyright (c) 2011, 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 "vm/assert.h"
 #include "vm/bootstrap.h"
 #include "vm/heap.h"
 #include "vm/object.h"
@@ skipping 48 matching lines @@
   }
   return ReadObjectImpl(header);
 }
 
 
 RawClass* SnapshotReader::ReadClassId(intptr_t object_id) {
   ASSERT(kind_ != Snapshot::kFull);
   // Read the class header information and lookup the class.
   intptr_t class_header = Read<intptr_t>();
   ASSERT((class_header & kSmiTagMask) != 0);
-  Class& cls = Class::Handle();
+  Class& cls = Class::ZoneHandle();
   cls ^= LookupInternalClass(class_header);
   AddBackwardReference(object_id, &cls);
   if (cls.IsNull()) {
     // Read the library/class information and lookup the class.
     String& library_url = String::Handle();
     library_url ^= ReadObjectImpl(class_header);
     String& class_name = String::Handle();
     class_name ^= ReadObject();
     const Library& library =
         Library::Handle(Library::LookupLibrary(library_url));
@@ skipping 106 matching lines @@
     RawObject* raw = Object::Allocate(cls, instance_size, Heap::kNew);
     result ^= raw;
     intptr_t offset = Object::InstanceSize();
     while (offset < instance_size) {
       obj = ReadObject();
       result.SetFieldAtOffset(offset, obj);
       offset += kWordSize;
     }
     if (kind_ == Snapshot::kFull) {
       result.SetCreatedFromSnapshot();
+    } else if (result.IsCanonical()) {
+      result = result.Canonicalize();
     }
     return result.raw();
   } else {
     ASSERT((class_header & kSmiTagMask) != 0);
     cls ^= LookupInternalClass(class_header);
     ASSERT(!cls.IsNull());
   }
   switch (cls.instance_kind()) {
 #define SNAPSHOT_READ(clazz)                                                   \
     case clazz::kInstanceKind: {                                               \
@@ skipping 206 matching lines @@
 void SnapshotWriter::WriteClassId(RawClass* cls) {
   ASSERT(kind_ != Snapshot::kFull);
   int id = object_store()->GetClassIndex(cls);
   if (IsSingletonClassId(id) || IsObjectStoreClassId(id)) {
     WriteIndexedObject(id);
   } else {
     // TODO(5411462): Should restrict this to only core-lib classes in this
     // case.
     // Write out the class and tags information.
     WriteObjectHeader(Object::kClassClass, cls->ptr()->tags_);
+
     // Write out the library url and class name.
     RawLibrary* library = cls->ptr()->library_;
     ASSERT(library != Library::null());
     WriteObject(library->ptr()->url_);
     WriteObject(cls->ptr()->name_);
   }
 }
 
 
-void ScriptSnapshotWriter::WriteScriptSnapshot() {
-  // TODO(asiva): Need to implement this.
-  UNIMPLEMENTED();
+void ScriptSnapshotWriter::WriteScriptSnapshot(const Library& lib) {
+  ASSERT(kind() == Snapshot::kScript);
+
+  // Write out the library object.
+  WriteObject(lib.raw());
+
+  // Finalize the snapshot buffer.
+  FinalizeBuffer();
 }
 
 
 void SnapshotWriterVisitor::VisitPointers(RawObject** first, RawObject** last) {
   for (RawObject** current = first; current <= last; current++) {
     RawObject* raw_obj = *current;
     writer_->WriteObject(raw_obj);
   }
 }
 
 }  // namespace dart