diff options
| author | 2016-08-31 17:49:55 +0000 | |
|---|---|---|
| committer | 2016-08-31 17:49:55 +0000 | |
| commit | 3d08238729dedecba73ddc0b42bc6bbf4806ecae (patch) | |
| tree | 92989553b03c704f79e2aae907b3b10479bc830e /runtime/entrypoints/entrypoint_utils.cc | |
| parent | 081e7a16c4fcbdb014441a236e12f58eb89ff99a (diff) | |
| parent | bdf7f1c3ab65ccb70f62db5ab31dba060632d458 (diff) | |
Merge "ART: SHARED_REQUIRES to REQUIRES_SHARED"
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.cc')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index fd1c02f725..4056ec53a4 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -43,7 +43,7 @@ static inline mirror::Class* CheckFilledNewArrayAlloc(uint32_t type_idx, ArtMethod* referrer, Thread* self, bool access_check) - SHARED_REQUIRES(Locks::mutator_lock_) { + REQUIRES_SHARED(Locks::mutator_lock_) { if (UNLIKELY(component_count < 0)) { ThrowNegativeArraySizeException(component_count); return nullptr; // Failure @@ -259,7 +259,7 @@ bool FillArrayData(mirror::Object* obj, const Instruction::ArrayDataPayload* pay ArtMethod* GetCalleeSaveMethodCaller(ArtMethod** sp, Runtime::CalleeSaveType type, bool do_caller_check) - SHARED_REQUIRES(Locks::mutator_lock_) { + REQUIRES_SHARED(Locks::mutator_lock_) { DCHECK_EQ(*sp, Runtime::Current()->GetCalleeSaveMethod(type)); const size_t callee_frame_size = GetCalleeSaveFrameSize(kRuntimeISA, type); |