diff options
| author | 2015-07-16 20:32:27 -0700 | |
|---|---|---|
| committer | 2015-07-22 15:13:56 -0700 | |
| commit | 90443477f9a0061581c420775ce3b7eeae7468bc (patch) | |
| tree | 8c74b81dfae162e0fd0ccf8d5ac50827ba815174 /runtime/monitor_test.cc | |
| parent | 6078aec213dfaf111c29969706e8e5967cfc9bea (diff) | |
Move to newer clang annotations
Also enable -Wthread-safety-negative.
Changes:
Switch to capabilities and negative capabilities.
Future work:
Use capabilities to implement uninterruptible annotations to work
with AssertNoThreadSuspension.
Bug: 20072211
Change-Id: I42fcbe0300d98a831c89d1eff3ecd5a7e99ebf33
Diffstat (limited to 'runtime/monitor_test.cc')
| -rw-r--r-- | runtime/monitor_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/monitor_test.cc b/runtime/monitor_test.cc index 2a29c60a13..1be637c8a5 100644 --- a/runtime/monitor_test.cc +++ b/runtime/monitor_test.cc @@ -60,7 +60,7 @@ static const size_t kMaxHandles = 1000000; // Use arbitrary large amount for no static void FillHeap(Thread* self, ClassLinker* class_linker, std::unique_ptr<StackHandleScope<kMaxHandles>>* hsp, std::vector<MutableHandle<mirror::Object>>* handles) - SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + SHARED_REQUIRES(Locks::mutator_lock_) { Runtime::Current()->GetHeap()->SetIdealFootprint(1 * GB); hsp->reset(new StackHandleScope<kMaxHandles>(self)); |