Write the contents of ICData and ObjectPools more eagerly and the contents of Code and Functions

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/bootstrap.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
@@ skipping 2208 matching lines @@
   return false;
 }
 
 
 void SnapshotWriter::WriteObjectImpl(RawObject* raw, bool as_reference) {
   // First check if object can be written as a simple predefined type.
   if (CheckAndWritePredefinedObject(raw)) {
     return;
   }
 
-  if (as_reference && !raw->IsCanonical()) {
-    WriteObjectRef(raw);
-  } else {
+  // Objects are usually writen as references to avoid deep recursion, but in
+  // some places we know we are dealing with leaf or shallow objects and write
+  // them inline.
+  // Code and Instructions are written inline so that Functions and Code
+  // can patch their entry points in their ReadFrom's. TODO(rmacnak): Remove the
+  // special case for Code and Instructions and patch entries after the whole
+  // graph has been loaded.
+  if (!as_reference ||
+      raw->IsCanonical() ||
+      raw->IsCode() ||
+      raw->IsInstructions()) {
     // Object is being serialized, add it to the forward ref list and mark
     // it so that future references to this object in the snapshot will use
     // an object id, instead of trying to serialize it again.
     forward_list_->MarkAndAddObject(raw, kIsSerialized);
 
     WriteInlinedObject(raw);
+  } else {
+    WriteObjectRef(raw);
   }
 }
 
 
 void SnapshotWriter::WriteObjectRef(RawObject* raw) {
   NoSafepointScope no_safepoint;
   RawClass* cls = class_table_->At(raw->GetClassId());
   intptr_t class_id = cls->ptr()->id_;
   ASSERT(class_id == raw->GetClassId());
   if (class_id >= kNumPredefinedCids ||
@@ skipping 553 matching lines @@
     NoSafepointScope no_safepoint;
     WriteObject(obj.raw());
     UnmarkAll();
   } else {
     ThrowException(exception_type(), exception_msg());
   }
 }
 
 
 }  // namespace dart