commit 956a5228276693a7317ae6b41bfe7a7f0f3cbe6b
author Andreas Gampe <agampe@google.com> Sat Aug 16 13:41:10 2014 -0700
committer Andreas Gampe <agampe@google.com> Mon Aug 18 09:40:40 2014 -0700
tree 4fb359d422d2d7af04f1b9dc9b8b5d6f268b138b
parent 078f4ea927b3259d698ca3dd542a096943e2cccd

ART: Do not recursively abort when visiting locks in a bad state

This avoids a nested abort in VisitLocks.

Bug: 17080621, 16382675

(cherry picked from commit 760172c3ccd6e75f6f1a89d8006934e8ffb1303e)

Change-Id: Id604976ac9dcac0e319fb25cab4d2cbc98d7ee24

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index f06d081..c7cd57d 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -906,7 +906,8 @@
         Monitor::DescribeWait(os, thread);
       }
       if (can_allocate) {
-        Monitor::VisitLocks(this, DumpLockedObject, &os);
+        // Visit locks, but do not abort on errors. This would trigger a nested abort.
+        Monitor::VisitLocks(this, DumpLockedObject, &os, false);
       }
     }