| commit | dc00c73d24a46c8522176fbc539f3e39710807c2 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Nov 25 21:30:20 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Nov 25 21:30:21 2014 +0000 |
| tree | bb7e95e935c2427fdf520516573db91262ec81f6 | |
| parent | f0c001465371279355eeb7633b67ffcc6f6738e5 [diff] | |
| parent | 90675a77fa03850ebd46280e60b0ff54b8d5eb79 [diff] |
Merge "ART: Avoid recursive abort"
diff --git a/runtime/base/mutex.cc b/runtime/base/mutex.cc index 4957988..aa2aefc 100644 --- a/runtime/base/mutex.cc +++ b/runtime/base/mutex.cc
@@ -209,7 +209,9 @@ } } } - CHECK(!bad_mutexes_held); + if (gAborting == 0) { // Avoid recursive aborts. + CHECK(!bad_mutexes_held); + } } }