commit 69ee5e3a7d8d70dee9f465c6825f1908a7c724de
author Carl Shapiro <cshapiro@google.com> Fri Feb 25 19:42:07 2011 -0800
committer Carl Shapiro <cshapiro@google.com> Fri Feb 25 19:45:56 2011 -0800
tree 266827b446ce1cebc66caa64e5171a37e8201ba7
parent 6d167a4b02f310700a55fc9a24fccce999e0fdf2

Assert that objects passed to scanObject are marked.

This condition could be assumed true as scanObject was only passed
objects that had been popped from the mark stack.  With the new
garbage collector objects to scan may be coming from bitmap or card
table scans.  Improper use of the scanning primitives can result in
unmarked objects being scanned.

Change-Id: I416cad2638c512a88a14fdfa693eb62392b5e63b

vm/alloc/MarkSweep.c

diff --git a/vm/alloc/MarkSweep.c b/vm/alloc/MarkSweep.c
index 1fb3f24..8bb2de6 100644
--- a/vm/alloc/MarkSweep.c
+++ b/vm/alloc/MarkSweep.c
@@ -478,6 +478,7 @@
 {
     assert(obj != NULL);
     assert(ctx != NULL);
+    assert(isMarked(obj, ctx));
     assert(obj->clazz != NULL);
     if (obj->clazz == gDvm.classJavaLangClass) {
         scanClassObject(obj, ctx);