In SnapshotReader, changes BackRefNode to be a ValueObject.

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"
 #include "vm/exceptions.h"
 #include "vm/heap.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/snapshot_ids.h"
 #include "vm/symbols.h"
 
 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;
 
 
 static bool IsSingletonClassId(intptr_t class_id) {
   // Check if this is a singleton object class which is shared by all isolates.
   return ((class_id >= kClassCid && class_id <= kUnwindErrorCid) ||
           (class_id >= kNullCid && class_id <= kVoidCid));
 }
 
@@ skipping 136 matching lines @@
 
 
 RawObject* SnapshotReader::ReadObject() {
   const Instance& null_object = Instance::Handle();
   *ErrorHandle() = UnhandledException::New(null_object, null_object);
   // Setup for long jump in case there is an exception while reading.
   LongJumpScope jump;
   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();
   } else {
     // An error occurred while reading, return the error object.
     const Error& err = Error::Handle(isolate()->object_store()->sticky_error());
     isolate()->object_store()->clear_sticky_error();
     return err.raw();
   }
 }
@@ skipping 144 matching lines @@
   }
   return obj_.raw();
 }
 
 
 void SnapshotReader::AddBackRef(intptr_t id,
                                 Object* obj,
                                 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);
 }
 
 
 Object* SnapshotReader::GetBackRef(intptr_t id) {
   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;
 }
 
 
 void SnapshotReader::ReadFullSnapshot() {
   ASSERT(kind_ == Snapshot::kFull);
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   ObjectStore* object_store = isolate->object_store();
   ASSERT(object_store != NULL);
   NoGCScope no_gc;
 
   // TODO(asiva): Add a check here to ensure we have the right heap
   // size for the full snapshot being read.
 
   // Read in all the objects stored in the object store.
   intptr_t num_flds = (object_store->to() - object_store->from());
   for (intptr_t i = 0; i <= num_flds; i++) {
     *(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);
     }
   }
 
   // Validate the class table.
 #if defined(DEBUG)
   isolate->ValidateClassTable();
 #endif
 
   // Setup native resolver for bootstrap impl.
   Bootstrap::SetupNativeResolver();
@@ skipping 1183 matching lines @@
     NoGCScope no_gc;
     WriteObject(obj.raw());
     UnmarkAll();
   } else {
     ThrowException(exception_type(), exception_msg());
   }
 }
 
 
 }  // namespace dart