commit 57a77c8650e84aefbc9985350989242296a18e00
author Mathieu Chartier <mathieuc@google.com> Mon Jul 15 23:30:23 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 15 23:30:23 2013 +0000
tree faf5e30ca8be31fc1d9336c6062888b1269801ba
parent add037df2399821eb048a5d9146a9d2174bcd1bd
parent 4fcb8d335cc856380531a42c8c708cc789a77395

Merge "Remove stale comments and kDebugLocking check" into dalvik-dev

runtime/gc/collector/mark_sweep.cc

diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc
index 279796f..79a571b 100644
--- a/runtime/gc/collector/mark_sweep.cc
+++ b/runtime/gc/collector/mark_sweep.cc
@@ -402,9 +402,7 @@
     ++large_object_test_;
   }
   if (UNLIKELY(!large_objects->Test(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)) {
+    if (!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();