Fix gcstress tests
We may visit the native roots multiple times (e.g. temp classes).
This used to not be handled by the SS GC but is now handle by
MarkObjectIfNotInToSpace.
Change-Id: I18226e20b36ace41c155ba4c3f54eac2244f524c
diff --git a/runtime/gc/collector/semi_space-inl.h b/runtime/gc/collector/semi_space-inl.h
index a7de44f..06d20f5 100644
--- a/runtime/gc/collector/semi_space-inl.h
+++ b/runtime/gc/collector/semi_space-inl.h
@@ -83,6 +83,14 @@
}
}
+template<bool kPoisonReferences>
+inline void SemiSpace::MarkObjectIfNotInToSpace(
+ mirror::ObjectReference<kPoisonReferences, mirror::Object>* obj_ptr) {
+ if (!to_space_->HasAddress(obj_ptr->AsMirrorPtr())) {
+ MarkObject(obj_ptr);
+ }
+}
+
} // namespace collector
} // namespace gc
} // namespace art
diff --git a/runtime/gc/collector/semi_space.cc b/runtime/gc/collector/semi_space.cc
index acc1d9b..63def24 100644
--- a/runtime/gc/collector/semi_space.cc
+++ b/runtime/gc/collector/semi_space.cc
@@ -707,7 +707,9 @@
Locks::mutator_lock_->AssertExclusiveHeld(Thread::Current());
Locks::heap_bitmap_lock_->AssertExclusiveHeld(Thread::Current());
}
- collector_->MarkObject(root);
+ // We may visit the same root multiple times, so avoid marking things in the to-space since
+ // this is not handled by the GC.
+ collector_->MarkObjectIfNotInToSpace(root);
}
private:
diff --git a/runtime/gc/collector/semi_space.h b/runtime/gc/collector/semi_space.h
index d5772a0..b9246ca 100644
--- a/runtime/gc/collector/semi_space.h
+++ b/runtime/gc/collector/semi_space.h
@@ -103,6 +103,10 @@
void MarkObject(mirror::ObjectReference<kPoisonReferences, mirror::Object>* obj_ptr)
REQUIRES(Locks::heap_bitmap_lock_, Locks::mutator_lock_);
+ template<bool kPoisonReferences>
+ void MarkObjectIfNotInToSpace(mirror::ObjectReference<kPoisonReferences, mirror::Object>* obj_ptr)
+ REQUIRES(Locks::heap_bitmap_lock_, Locks::mutator_lock_);
+
virtual mirror::Object* MarkObject(mirror::Object* root) OVERRIDE
REQUIRES(Locks::heap_bitmap_lock_, Locks::mutator_lock_);