diff options
Diffstat (limited to 'runtime/quick')
| -rw-r--r-- | runtime/quick/inline_method_analyser.cc | 8 | ||||
| -rw-r--r-- | runtime/quick/inline_method_analyser.h | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/runtime/quick/inline_method_analyser.cc b/runtime/quick/inline_method_analyser.cc index a6e3693b65..dc6f4ebc9c 100644 --- a/runtime/quick/inline_method_analyser.cc +++ b/runtime/quick/inline_method_analyser.cc @@ -141,7 +141,7 @@ bool Matcher::DoMatch(const DexFile::CodeItem* code_item, MatchFn* const* patter // Used for a single invoke in a constructor. In that situation, the method verifier makes // sure we invoke a constructor either in the same class or superclass with at least "this". ArtMethod* GetTargetConstructor(ArtMethod* method, const Instruction* invoke_direct) - SHARED_REQUIRES(Locks::mutator_lock_) { + REQUIRES_SHARED(Locks::mutator_lock_) { DCHECK_EQ(invoke_direct->Opcode(), Instruction::INVOKE_DIRECT); DCHECK_EQ(invoke_direct->VRegC_35c(), method->GetCodeItem()->registers_size_ - method->GetCodeItem()->ins_size_); @@ -212,7 +212,7 @@ bool RecordConstructorIPut(ArtMethod* method, uint16_t this_vreg, uint16_t zero_vreg_mask, /*inout*/ ConstructorIPutData (&iputs)[kMaxConstructorIPuts]) - SHARED_REQUIRES(Locks::mutator_lock_) { + REQUIRES_SHARED(Locks::mutator_lock_) { DCHECK(IsInstructionIPut(new_iput->Opcode())); uint32_t field_index = new_iput->VRegC_22c(); PointerSize pointer_size = Runtime::Current()->GetClassLinker()->GetImagePointerSize(); @@ -253,7 +253,7 @@ bool RecordConstructorIPut(ArtMethod* method, bool DoAnalyseConstructor(const DexFile::CodeItem* code_item, ArtMethod* method, /*inout*/ ConstructorIPutData (&iputs)[kMaxConstructorIPuts]) - SHARED_REQUIRES(Locks::mutator_lock_) { + REQUIRES_SHARED(Locks::mutator_lock_) { // On entry we should not have any IPUTs yet. DCHECK_EQ(0, std::count_if( iputs, @@ -367,7 +367,7 @@ bool DoAnalyseConstructor(const DexFile::CodeItem* code_item, bool AnalyseConstructor(const DexFile::CodeItem* code_item, ArtMethod* method, InlineMethod* result) - SHARED_REQUIRES(Locks::mutator_lock_) { + REQUIRES_SHARED(Locks::mutator_lock_) { ConstructorIPutData iputs[kMaxConstructorIPuts]; if (!DoAnalyseConstructor(code_item, method, iputs)) { return false; diff --git a/runtime/quick/inline_method_analyser.h b/runtime/quick/inline_method_analyser.h index 0e12d73595..356e290843 100644 --- a/runtime/quick/inline_method_analyser.h +++ b/runtime/quick/inline_method_analyser.h @@ -217,9 +217,9 @@ class InlineMethodAnalyser { * @return true if the method is a candidate for inlining, false otherwise. */ static bool AnalyseMethodCode(verifier::MethodVerifier* verifier, InlineMethod* result) - SHARED_REQUIRES(Locks::mutator_lock_); + REQUIRES_SHARED(Locks::mutator_lock_); static bool AnalyseMethodCode(ArtMethod* method, InlineMethod* result) - SHARED_REQUIRES(Locks::mutator_lock_); + REQUIRES_SHARED(Locks::mutator_lock_); static constexpr bool IsInstructionIGet(Instruction::Code opcode) { return Instruction::IGET <= opcode && opcode <= Instruction::IGET_SHORT; @@ -246,7 +246,7 @@ class InlineMethodAnalyser { bool is_static, ArtMethod* method, InlineMethod* result) - SHARED_REQUIRES(Locks::mutator_lock_); + REQUIRES_SHARED(Locks::mutator_lock_); static bool AnalyseReturnMethod(const DexFile::CodeItem* code_item, InlineMethod* result); static bool AnalyseConstMethod(const DexFile::CodeItem* code_item, InlineMethod* result); static bool AnalyseIGetMethod(const DexFile::CodeItem* code_item, @@ -254,13 +254,13 @@ class InlineMethodAnalyser { bool is_static, ArtMethod* method, InlineMethod* result) - SHARED_REQUIRES(Locks::mutator_lock_); + REQUIRES_SHARED(Locks::mutator_lock_); static bool AnalyseIPutMethod(const DexFile::CodeItem* code_item, const MethodReference& method_ref, bool is_static, ArtMethod* method, InlineMethod* result) - SHARED_REQUIRES(Locks::mutator_lock_); + REQUIRES_SHARED(Locks::mutator_lock_); // Can we fast path instance field access in a verified accessor? // If yes, computes field's offset and volatility and whether the method is static or not. @@ -268,7 +268,7 @@ class InlineMethodAnalyser { uint32_t field_idx, bool is_put, InlineIGetIPutData* result) - SHARED_REQUIRES(Locks::mutator_lock_); + REQUIRES_SHARED(Locks::mutator_lock_); }; } // namespace art |