commit c62110668b7ceac450c3abcf279476139bf4e566
author Mathieu Chartier <mathieuc@google.com> Fri Jul 24 16:05:55 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Fri Jul 24 16:09:05 2015 -0700
tree 621873058f3de913a486fdbf3ab2d8afe75c9d59
parent 34e1ed2ff52b4a3a1115b6ad467d6978d2b489a3

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

runtime/gc/collector/semi_space.cc

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: