diff options
| author | 2014-11-03 21:36:10 -0800 | |
|---|---|---|
| committer | 2014-11-04 18:40:08 -0800 | |
| commit | 277ccbd200ea43590dfc06a93ae184a765327ad0 (patch) | |
| tree | d89712e93da5fb2748989353c9ee071102cf3f33 /compiler/utils/arm/assembler_arm.cc | |
| parent | ad17d41841ba1fb177fb0bf175ec0e9f5e1412b3 (diff) | |
ART: More warnings
Enable -Wno-conversion-null, -Wredundant-decls and -Wshadow in general,
and -Wunused-but-set-parameter for GCC builds.
Change-Id: I81bbdd762213444673c65d85edae594a523836e5
Diffstat (limited to 'compiler/utils/arm/assembler_arm.cc')
| -rw-r--r-- | compiler/utils/arm/assembler_arm.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/utils/arm/assembler_arm.cc b/compiler/utils/arm/assembler_arm.cc index e9788f91ba..591d461244 100644 --- a/compiler/utils/arm/assembler_arm.cc +++ b/compiler/utils/arm/assembler_arm.cc @@ -301,11 +301,11 @@ uint32_t Address::vencoding() const { CHECK(IsAbsoluteUint(10, offset)); // In the range -1020 to +1020. CHECK_ALIGNED(offset, 2); // Multiple of 4. CHECK((am_ == Offset) || (am_ == NegOffset)); - uint32_t vencoding = (encoding & (0xf << kRnShift)) | (offset >> 2); + uint32_t vencoding_value = (encoding & (0xf << kRnShift)) | (offset >> 2); if (am_ == Offset) { - vencoding |= 1 << 23; + vencoding_value |= 1 << 23; } - return vencoding; + return vencoding_value; } |