diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-24 00:21:06 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-24 00:21:06 -0800 |
| commit | 90675a77fa03850ebd46280e60b0ff54b8d5eb79 (patch) | |
| tree | 9a891b47e6b7e4e5f1c123a477ec2876b8183b52 | |
| parent | 4a9ac63ba407edc09e13b4e095e2105cf13f603b (diff) | |
| download | art-90675a77fa03850ebd46280e60b0ff54b8d5eb79.zip art-90675a77fa03850ebd46280e60b0ff54b8d5eb79.tar.gz art-90675a77fa03850ebd46280e60b0ff54b8d5eb79.tar.bz2 | |
ART: Avoid recursive abort
Bug: 18469797
Change-Id: Ided50bec3377034dd9a995f9f0700a795adb3940
| -rw-r--r-- | runtime/base/mutex.cc | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ void BaseMutex::CheckSafeToWait(Thread* self) { } } } - CHECK(!bad_mutexes_held); + if (gAborting == 0) { // Avoid recursive aborts. + CHECK(!bad_mutexes_held); + } } } |