diff options
Diffstat (limited to 'runtime/gc/heap.h')
| -rw-r--r-- | runtime/gc/heap.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h index fc61fc57d5..36a3767721 100644 --- a/runtime/gc/heap.h +++ b/runtime/gc/heap.h @@ -216,7 +216,11 @@ class Heap { // Visit all of the live objects in the heap. void VisitObjects(ObjectCallback callback, void* arg) - SHARED_LOCKS_REQUIRED(Locks::heap_bitmap_lock_, Locks::mutator_lock_); + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) + LOCKS_EXCLUDED(Locks::heap_bitmap_lock_); + void VisitObjectsInternal(ObjectCallback callback, void* arg) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) + LOCKS_EXCLUDED(Locks::heap_bitmap_lock_); void CheckPreconditionsForAllocObject(mirror::Class* c, size_t byte_count) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); @@ -245,7 +249,7 @@ class Heap { void VerifyHeap() LOCKS_EXCLUDED(Locks::heap_bitmap_lock_); // Returns how many failures occured. size_t VerifyHeapReferences(bool verify_referents = true) - EXCLUSIVE_LOCKS_REQUIRED(Locks::heap_bitmap_lock_, Locks::mutator_lock_); + EXCLUSIVE_LOCKS_REQUIRED(Locks::mutator_lock_); bool VerifyMissingCardMarks() EXCLUSIVE_LOCKS_REQUIRED(Locks::heap_bitmap_lock_, Locks::mutator_lock_); @@ -741,7 +745,8 @@ class Heap { void PrePauseRosAllocVerification(collector::GarbageCollector* gc) EXCLUSIVE_LOCKS_REQUIRED(Locks::mutator_lock_); void PreSweepingGcVerification(collector::GarbageCollector* gc) - EXCLUSIVE_LOCKS_REQUIRED(Locks::mutator_lock_); + EXCLUSIVE_LOCKS_REQUIRED(Locks::mutator_lock_) + LOCKS_EXCLUDED(Locks::heap_bitmap_lock_); void PostGcVerification(collector::GarbageCollector* gc) LOCKS_EXCLUDED(Locks::mutator_lock_); void PostGcVerificationPaused(collector::GarbageCollector* gc) |