diff options
| author | 2016-05-11 11:26:48 -0700 | |
|---|---|---|
| committer | 2016-05-13 10:38:56 -0700 | |
| commit | fba39972d99701c80bf3beb7451aca508d67593c (patch) | |
| tree | 0d80ecb6997290140503926b08a72e7418915526 /runtime/dex_instruction.cc | |
| parent | 718d4e269810c17d03df909c84b2f7bbd4f61fb9 (diff) | |
Fix misc-macro-parentheses warnings.
* Add parentheses to fix warnings.
* Use NOLINT to suppress wrong clang-tidy warnings.
Bug: 28705665
Change-Id: Icc8bc9b59583dee0ea17ab83e0ff0383b8599c3e
Diffstat (limited to 'runtime/dex_instruction.cc')
| -rw-r--r-- | runtime/dex_instruction.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/dex_instruction.cc b/runtime/dex_instruction.cc index 3f621249c5..300e618c82 100644 --- a/runtime/dex_instruction.cc +++ b/runtime/dex_instruction.cc @@ -69,11 +69,11 @@ int const Instruction::kInstructionVerifyFlags[] = { int const Instruction::kInstructionSizeInCodeUnits[] = { #define INSTRUCTION_SIZE(opcode, c, p, format, r, i, a, v) \ - ((opcode == NOP) ? -1 : \ - ((format >= k10x) && (format <= k10t)) ? 1 : \ - ((format >= k20t) && (format <= k25x)) ? 2 : \ - ((format >= k32x) && (format <= k3rc)) ? 3 : \ - (format == k51l) ? 5 : -1), + (((opcode) == NOP) ? -1 : \ + (((format) >= k10x) && ((format) <= k10t)) ? 1 : \ + (((format) >= k20t) && ((format) <= k25x)) ? 2 : \ + (((format) >= k32x) && ((format) <= k3rc)) ? 3 : \ + ((format) == k51l) ? 5 : -1), #include "dex_instruction_list.h" DEX_INSTRUCTION_LIST(INSTRUCTION_SIZE) #undef DEX_INSTRUCTION_LIST |