commit f0bbeabf0577627e9fb29f204a036e3cd51e8bae
author Ian Rogers <irogers@google.com> Wed Oct 10 18:26:27 2012 -0700
committer Ian Rogers <irogers@google.com> Wed Oct 10 18:26:27 2012 -0700
tree 7b7789bcd8ed03deb25a7c68aa6a0ccf82201324
parent 7204db592a999318067b9c509e14aa8b30293e58

Improve heap lock annotations.

Fix a deadlock in non-concurrent mark sweep caught by this.
Broaden heap_bitmap_lock_ over bitmap swapping.

Change-Id: I5e749f25d181217d530e2f573dc8aee2685108ad

src/gc/heap_bitmap.h

diff --git a/src/gc/heap_bitmap.h b/src/gc/heap_bitmap.h
index 23dcd47..1610df8 100644
--- a/src/gc/heap_bitmap.h
+++ b/src/gc/heap_bitmap.h
@@ -25,8 +25,7 @@
 
   class HeapBitmap {
    public:
-    bool Test(const Object* obj)
-        SHARED_LOCKS_REQUIRED(Locks::heap_bitmap_lock_) {
+    bool Test(const Object* obj) SHARED_LOCKS_REQUIRED(Locks::heap_bitmap_lock_) {
       SpaceBitmap* bitmap = GetSpaceBitmap(obj);
       if (LIKELY(bitmap != NULL)) {
         return bitmap->Test(obj);