diff options
| author | 2016-08-31 17:49:55 +0000 | |
|---|---|---|
| committer | 2016-08-31 17:49:55 +0000 | |
| commit | 3d08238729dedecba73ddc0b42bc6bbf4806ecae (patch) | |
| tree | 92989553b03c704f79e2aae907b3b10479bc830e /runtime/quick/inline_method_analyser.cc | |
| parent | 081e7a16c4fcbdb014441a236e12f58eb89ff99a (diff) | |
| parent | bdf7f1c3ab65ccb70f62db5ab31dba060632d458 (diff) | |
Merge "ART: SHARED_REQUIRES to REQUIRES_SHARED"
Diffstat (limited to 'runtime/quick/inline_method_analyser.cc')
| -rw-r--r-- | runtime/quick/inline_method_analyser.cc | 8 |
1 files changed, 4 insertions, 4 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; |