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_thumb2.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_thumb2.cc')
| -rw-r--r-- | compiler/utils/arm/assembler_thumb2.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/utils/arm/assembler_thumb2.cc b/compiler/utils/arm/assembler_thumb2.cc index fd2613a89e..71d6e7ead8 100644 --- a/compiler/utils/arm/assembler_thumb2.cc +++ b/compiler/utils/arm/assembler_thumb2.cc @@ -2121,8 +2121,8 @@ void Thumb2Assembler::Bind(Label* label) { branch->ResetSize(Branch::k16Bit); // Now add a compare instruction in the place the branch was. - int16_t cmp = B13 | B11 | static_cast<int16_t>(branch->GetRegister()) << 8; - buffer_.Store<int16_t>(branch_location, cmp); + buffer_.Store<int16_t>(branch_location, + B13 | B11 | static_cast<int16_t>(branch->GetRegister()) << 8); // Since have moved made a hole in the code we need to reload the // current pc. |