| Index: runtime/vm/gc_marker.cc
|
| ===================================================================
|
| --- runtime/vm/gc_marker.cc (revision 22083)
|
| +++ runtime/vm/gc_marker.cc (working copy)
|
| @@ -175,6 +175,7 @@
|
| ASSERT(!raw_obj->IsMarked());
|
| RawClass* raw_class = isolate()->class_table()->At(raw_obj->GetClassId());
|
| raw_obj->SetMarkBit();
|
| + raw_obj->ClearRememberedBit();
|
| if (raw_obj->IsWatched()) {
|
| std::pair<DelaySet::iterator, DelaySet::iterator> ret;
|
| // Visit all elements with a key equal to raw_obj.
|
| @@ -201,8 +202,10 @@
|
| // Skip over new objects, but verify consistency of heap while at it.
|
| if (raw_obj->IsNewObject()) {
|
| // TODO(iposva): Add consistency check.
|
| - if (visiting_old_object_ != NULL) {
|
| + if ((visiting_old_object_ != NULL) &&
|
| + !visiting_old_object_->IsRemembered()) {
|
| ASSERT(p != NULL);
|
| + visiting_old_object_->SetRememberedBit();
|
| isolate()->store_buffer()->AddPointer(
|
| reinterpret_cast<uword>(visiting_old_object_));
|
| }
|
|
|