commit 8afe6e0d8c4151ac74afc4ebe0dab85550821243
author Ian Rogers <irogers@google.com> Wed Jun 12 19:40:25 2013 -0700
committer Ian Rogers <irogers@google.com> Wed Jun 12 20:47:08 2013 -0700
tree 8992079321298018509d57bb80fef88edabb9904
parent e4c41c22f4c76cb825f3c731fd1518020201028d

Temporarily disable los contains check.

Bug: 9414652.
Change-Id: I17e99d1c5ed37c5de7b2a03d168f72abbff7408e

src/gc/mark_sweep.cc

diff --git a/src/gc/mark_sweep.cc b/src/gc/mark_sweep.cc
index 25b4b78..14d604a 100644
--- a/src/gc/mark_sweep.cc
+++ b/src/gc/mark_sweep.cc
@@ -422,7 +422,9 @@
     ++large_object_test_;
   }
   if (UNLIKELY(!large_objects->Test(obj))) {
-    if (!large_object_space->Contains(obj)) {
+    // TODO: mark may be called holding the JNI global references lock, Contains will hold the
+    // large object space lock causing a lock level violation. Bug: 9414652;
+    if (!kDebugLocking && !large_object_space->Contains(obj)) {
       LOG(ERROR) << "Tried to mark " << obj << " not contained by any spaces";
       LOG(ERROR) << "Attempting see if it's a bad root";
       VerifyRoots();