diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-12-15 17:37:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-15 17:37:59 +0000 |
| commit | 29045735a55726235e5c2c5156809cdcac61d4d7 (patch) | |
| tree | 4ed3343e3a9848a3fa2c4d9ac57894905fa10ea0 /runtime | |
| parent | 0379f1da1bc39ed554631fc34d899622bc675c50 (diff) | |
| parent | d64ba3813069b9d178eb2b8655c9675a20160364 (diff) | |
| download | art-29045735a55726235e5c2c5156809cdcac61d4d7.zip art-29045735a55726235e5c2c5156809cdcac61d4d7.tar.gz art-29045735a55726235e5c2c5156809cdcac61d4d7.tar.bz2 | |
Merge "Use WaitHoldingLocks in ReferenceProcessor::MakeCircularListIfUnenqueued."
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/gc/reference_processor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/gc/reference_processor.cc b/runtime/gc/reference_processor.cc index 012f9f9..99bd63f 100644 --- a/runtime/gc/reference_processor.cc +++ b/runtime/gc/reference_processor.cc @@ -234,7 +234,7 @@ bool ReferenceProcessor::MakeCircularListIfUnenqueued(mirror::FinalizerReference MutexLock mu(self, *Locks::reference_processor_lock_); // Wait untul we are done processing reference. while (SlowPathEnabled()) { - condition_.Wait(self); + condition_.WaitHoldingLocks(self); } // At this point, since the sentinel of the reference is live, it is guaranteed to not be // enqueued if we just finished processing references. Otherwise, we may be doing the main GC |