diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-06 09:35:22 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-04-06 14:05:07 -0700 |
| commit | 65b798ea10dd716c1bb3dda029f9bf255435af72 (patch) | |
| tree | 774e9901b6917989a63f07f927c3b4d8b921a013 /runtime/gc | |
| parent | c411c6cc327d3f2b3b4d1987b07dd442205d9454 (diff) | |
| download | art-65b798ea10dd716c1bb3dda029f9bf255435af72.zip art-65b798ea10dd716c1bb3dda029f9bf255435af72.tar.gz art-65b798ea10dd716c1bb3dda029f9bf255435af72.tar.bz2 | |
ART: Enable more Clang warnings
Change-Id: Ie6aba02f4223b1de02530e1515c63505f37e184c
Diffstat (limited to 'runtime/gc')
| -rw-r--r-- | runtime/gc/collector/concurrent_copying.cc | 3 | ||||
| -rw-r--r-- | runtime/gc/collector/concurrent_copying.h | 2 | ||||
| -rw-r--r-- | runtime/gc/heap.cc | 1 | ||||
| -rw-r--r-- | runtime/gc/task_processor.cc | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/runtime/gc/collector/concurrent_copying.cc b/runtime/gc/collector/concurrent_copying.cc index 56919bd..8aa1b52 100644 --- a/runtime/gc/collector/concurrent_copying.cc +++ b/runtime/gc/collector/concurrent_copying.cc @@ -804,6 +804,9 @@ class ConcurrentCopyingClearBlackPtrsVisitor { public: explicit ConcurrentCopyingClearBlackPtrsVisitor(ConcurrentCopying* cc) : collector_(cc) {} +#ifndef USE_BAKER_OR_BROOKS_READ_BARRIER + NO_RETURN +#endif void operator()(mirror::Object* obj) const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) SHARED_LOCKS_REQUIRED(Locks::heap_bitmap_lock_) { DCHECK(obj != nullptr); diff --git a/runtime/gc/collector/concurrent_copying.h b/runtime/gc/collector/concurrent_copying.h index a87053d..93de035 100644 --- a/runtime/gc/collector/concurrent_copying.h +++ b/runtime/gc/collector/concurrent_copying.h @@ -232,7 +232,7 @@ class ConcurrentCopying : public GarbageCollector { bool IsOnAllocStack(mirror::Object* ref) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); mirror::Object* GetFwdPtr(mirror::Object* from_ref) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - void FlipThreadRoots() LOCKS_EXCLUDED(Locks::mutator_lock_);; + void FlipThreadRoots() LOCKS_EXCLUDED(Locks::mutator_lock_); void SwapStacks(Thread* self) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void RecordLiveStackFreezeSize(Thread* self); void ComputeUnevacFromSpaceLiveRatio(); diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index d80bba6..b9153c1 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -504,7 +504,6 @@ MemMap* Heap::MapAnonymousPreferredAddress(const char* name, uint8_t* request_be // Retry a second time with no specified request begin. request_begin = nullptr; } - return nullptr; } bool Heap::MayUseCollector(CollectorType type) const { diff --git a/runtime/gc/task_processor.cc b/runtime/gc/task_processor.cc index 1a3c6f5..2ca4b3f 100644 --- a/runtime/gc/task_processor.cc +++ b/runtime/gc/task_processor.cc @@ -67,7 +67,6 @@ HeapTask* TaskProcessor::GetTask(Thread* self) { } } UNREACHABLE(); - return nullptr; } void TaskProcessor::UpdateTargetRunTime(Thread* self, HeapTask* task, uint64_t new_target_time) { |