Drain StoreBufferBlock into store buffer instead of iterating over it directly.

runtime/vm/store_buffer.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/store_buffer.h"
 
 #include "platform/assert.h"
 #include "vm/runtime_entry.h"
 
 namespace dart {
@@ skipping 43 matching lines @@
 void StoreBuffer::Reset() {
   DedupSet* current = DedupSets();
   while (current != NULL) {
     DedupSet* next = current->next();
     delete current;
     current = next;
   }
 }
 
 
+bool StoreBuffer::AddPointerInternal(uword address) {
+  ASSERT(dedup_sets_ != NULL);
+  ASSERT(Isolate::Current()->heap()->OldContains(address));
+  ASSERT((address & kSmiTagMask) != kSmiTag);
+  if (!dedup_sets_->set()->Add(address)) {
+    // Add a new DedupSet.
+    dedup_sets_ = new DedupSet(dedup_sets_);
+    count_++;
+    return true;
+  }
+  return false;
+}
+
+
 void StoreBuffer::AddPointer(uword address) {
-  ASSERT(dedup_sets_ != NULL);
-  ASSERT(Isolate::Current()->heap()->OldContains(address));
-  ASSERT((address & kSmiTagMask) != kSmiTag);
-  if (!dedup_sets_->set()->Add(address)) {
-    // Add a new DedupSet. Schedule an interrupt if we have run over the max
-    // number of DedupSets.
-    dedup_sets_ = new DedupSet(dedup_sets_);
-    count_++;
+  if (AddPointerInternal(address)) {
+    // Had to create a new DedupSet. Schedule an interrupt if we have run over
+    // the max number of DedupSets.
     // TODO(iposva): Fix magic number.
     if (count_ > 100) {
       Isolate::Current()->ScheduleInterrupts(Isolate::kStoreBufferInterrupt);
     }
   }
 }
 
+
+void StoreBuffer::ProcessBlock(StoreBufferBlock* block) {
+  intptr_t entries = block->Count();
+  for (intptr_t i = 0; i < entries; i++) {
+    AddPointerInternal(block->At(i));
+  }
+}

[siva, 2013/04/19 18:27:41]

This function may not be needed if ProcessBuffer was used and all the other
changes would not be needed.

[Vyacheslav Egorov (Google), 2013/04/19 19:40:20]

Done.

+
 }  // namespace dart