diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-04-14 15:52:08 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-04-14 16:49:54 -0700 |
| commit | e9ea70bb806f7c1dcd57efb6f48f1d6329d5f103 (patch) | |
| tree | aa62f233e3f873fd6b5184ff38dd90e702507e2b /runtime/gc | |
| parent | d6b9b62748e120f7a02eb315e5cc8179312a5d1a (diff) | |
| download | art-e9ea70bb806f7c1dcd57efb6f48f1d6329d5f103.zip art-e9ea70bb806f7c1dcd57efb6f48f1d6329d5f103.tar.gz art-e9ea70bb806f7c1dcd57efb6f48f1d6329d5f103.tar.bz2 | |
Fix clang build.
Change-Id: Iaf0b76cfc02bac5f49ab98d494db9a774211f453
Diffstat (limited to 'runtime/gc')
| -rw-r--r-- | runtime/gc/accounting/space_bitmap-inl.h | 4 | ||||
| -rw-r--r-- | runtime/gc/accounting/space_bitmap.h | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/runtime/gc/accounting/space_bitmap-inl.h b/runtime/gc/accounting/space_bitmap-inl.h index 08f7c87..ed140e0 100644 --- a/runtime/gc/accounting/space_bitmap-inl.h +++ b/runtime/gc/accounting/space_bitmap-inl.h @@ -68,8 +68,8 @@ inline bool SpaceBitmap<kAlignment>::Test(const mirror::Object* obj) const { } template<size_t kAlignment> template<typename Visitor> -void SpaceBitmap<kAlignment>::VisitMarkedRange(uintptr_t visit_begin, uintptr_t visit_end, - const Visitor& visitor) const { +inline void SpaceBitmap<kAlignment>::VisitMarkedRange(uintptr_t visit_begin, uintptr_t visit_end, + const Visitor& visitor) const { DCHECK_LT(visit_begin, visit_end); #if 0 for (uintptr_t i = visit_begin; i < visit_end; i += kAlignment) { diff --git a/runtime/gc/accounting/space_bitmap.h b/runtime/gc/accounting/space_bitmap.h index 891c8ed..b90a799 100644 --- a/runtime/gc/accounting/space_bitmap.h +++ b/runtime/gc/accounting/space_bitmap.h @@ -122,13 +122,12 @@ class SpaceBitmap { } } - /** - * Visit the live objects in the range [visit_begin, visit_end). - */ + // Visit the live objects in the range [visit_begin, visit_end). + // TODO: Use lock annotations when clang is fixed. + // EXCLUSIVE_LOCKS_REQUIRED(Locks::heap_bitmap_lock_) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); template <typename Visitor> void VisitMarkedRange(uintptr_t visit_begin, uintptr_t visit_end, const Visitor& visitor) const - EXCLUSIVE_LOCKS_REQUIRED(Locks::heap_bitmap_lock_) - SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + NO_THREAD_SAFETY_ANALYSIS; // Visits set bits in address order. The callback is not permitted to change the bitmap bits or // max during the traversal. |