In SnapshotReader, changes BackRefNode to be a ValueObject.

runtime/vm/snapshot.cc

Index: runtime/vm/snapshot.cc
===================================================================
--- runtime/vm/snapshot.cc	(revision 37080)
+++ runtime/vm/snapshot.cc	(working copy)
@@ -18,6 +18,8 @@
 
 namespace dart {
 
+#define I (isolate())

[siva, 2014/06/06 18:10:33]

Is this still needed?

[zra, 2014/06/06 18:30:57]

No. I've removed it.

+
 static const int kNumInitialReferencesInFullSnapshot = 160 * KB;
 static const int kNumInitialReferences = 64;
 
@@ -174,9 +176,9 @@
   if (setjmp(*jump.Set()) == 0) {
     Object& obj = Object::Handle(ReadObjectImpl());
     for (intptr_t i = 0; i < backward_references_.length(); i++) {
-      if (!backward_references_[i]->is_deserialized()) {
+      if (!backward_references_[i].is_deserialized()) {
         ReadObjectImpl();
-        backward_references_[i]->set_state(kIsDeserialized);
+        backward_references_[i].set_state(kIsDeserialized);
       }
     }
     return obj.raw();
@@ -341,8 +343,7 @@
                                 DeserializeState state) {
   intptr_t index = (id - kMaxPredefinedObjectIds);
   ASSERT(index == backward_references_.length());
-  BackRefNode* node = new BackRefNode(obj, state);
-  ASSERT(node != NULL);
+  BackRefNode node(obj, state);
   backward_references_.Add(node);
 }
 
@@ -351,7 +352,7 @@
   ASSERT(id >= kMaxPredefinedObjectIds);
   intptr_t index = (id - kMaxPredefinedObjectIds);
   if (index < backward_references_.length()) {
-    return backward_references_[index]->reference();
+    return backward_references_[index].reference();
   }
   return NULL;
 }
@@ -374,9 +375,9 @@
     *(object_store->from() + i) = ReadObjectImpl();
   }
   for (intptr_t i = 0; i < backward_references_.length(); i++) {
-    if (!backward_references_[i]->is_deserialized()) {
+    if (!backward_references_[i].is_deserialized()) {
       ReadObjectImpl();
-      backward_references_[i]->set_state(kIsDeserialized);
+      backward_references_[i].set_state(kIsDeserialized);
     }
   }