diff options
| author | 2016-08-31 17:49:55 +0000 | |
|---|---|---|
| committer | 2016-08-31 17:49:55 +0000 | |
| commit | 3d08238729dedecba73ddc0b42bc6bbf4806ecae (patch) | |
| tree | 92989553b03c704f79e2aae907b3b10479bc830e /compiler/optimizing/ssa_builder.cc | |
| parent | 081e7a16c4fcbdb014441a236e12f58eb89ff99a (diff) | |
| parent | bdf7f1c3ab65ccb70f62db5ab31dba060632d458 (diff) | |
Merge "ART: SHARED_REQUIRES to REQUIRES_SHARED"
Diffstat (limited to 'compiler/optimizing/ssa_builder.cc')
| -rw-r--r-- | compiler/optimizing/ssa_builder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/ssa_builder.cc b/compiler/optimizing/ssa_builder.cc index 5a574d9af7..f7dc112d00 100644 --- a/compiler/optimizing/ssa_builder.cc +++ b/compiler/optimizing/ssa_builder.cc @@ -303,7 +303,7 @@ static HArrayGet* CreateFloatOrDoubleEquivalentOfArrayGet(HArrayGet* aget) { } static Primitive::Type GetPrimitiveArrayComponentType(HInstruction* array) - SHARED_REQUIRES(Locks::mutator_lock_) { + REQUIRES_SHARED(Locks::mutator_lock_) { ReferenceTypeInfo array_type = array->GetReferenceTypeInfo(); DCHECK(array_type.IsPrimitiveArrayClass()); return array_type.GetTypeHandle()->GetComponentType()->GetPrimitiveType(); |