Add a hash map for a raw object to id mapping, this table will be used during snapshot writing in o…

runtime/vm/heap.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/heap.h"
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/flags.h"
 #include "vm/isolate.h"
@@ skipping 630 matching lines @@
 }
 
 
 int64_t Heap::PeerCount() const {
   return new_weak_tables_[kPeers]->count() + old_weak_tables_[kPeers]->count();
 }
 
 
 int64_t Heap::HashCount() const {
   return
       new_weak_tables_[kHashes]->count() + old_weak_tables_[kHashes]->count();

[Ivan Posva, 2015/10/12 09:19:00]

The line wrapping below is much nicer than this. Do you mind updating it here as
well?

[siva, 2015/10/12 17:50:19]

Done.

 }
 
 
+int64_t Heap::ObjectIdCount() const {
+  return new_weak_tables_[kObjectIds]->count() +
+      old_weak_tables_[kObjectIds]->count();
+}
+
+
+void Heap::ResetObjectIdTable() {
+  new_weak_tables_[kObjectIds]->Reset();
+  old_weak_tables_[kObjectIds]->Reset();
+}
+
+
 intptr_t Heap::GetWeakEntry(RawObject* raw_obj, WeakSelector sel) const {
   if (raw_obj->IsNewObject()) {
     return new_weak_tables_[sel]->GetValue(raw_obj);
   }
   ASSERT(raw_obj->IsOldObject());
   return old_weak_tables_[sel]->GetValue(raw_obj);
 }
 
 
 void Heap::SetWeakEntry(RawObject* raw_obj, WeakSelector sel, intptr_t val) {
@@ skipping 128 matching lines @@
   Dart::vm_isolate()->heap()->WriteProtect(false);
 }
 
 
 WritableVMIsolateScope::~WritableVMIsolateScope() {
   ASSERT(Dart::vm_isolate()->heap()->UsedInWords(Heap::kNew) == 0);
   Dart::vm_isolate()->heap()->WriteProtect(true);
 }
 
 }  // namespace dart