diff options
author | Ian Rogers <irogers@google.com> | 2014-10-09 21:56:44 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2014-10-09 22:22:46 -0700 |
commit | fc787ecd91127b2c8458afd94e5148e2ae51a1f5 (patch) | |
tree | ef48c0f511ee9bf4ed85607cc4d530bace7e6cae /compiler/dex/mir_graph.cc | |
parent | 8fa8c904f7c783204a1dc9438429391d256658da (diff) |
Enable -Wimplicit-fallthrough.
Falling through switch cases on a clang build must now annotate the fallthrough
with the FALLTHROUGH_INTENDED macro.
Bug: 17731372
Change-Id: I836451cd5f96b01d1ababdbf9eef677fe8fa8324
Diffstat (limited to 'compiler/dex/mir_graph.cc')
-rw-r--r-- | compiler/dex/mir_graph.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc index 7dfdc760bd..f0c9858627 100644 --- a/compiler/dex/mir_graph.cc +++ b/compiler/dex/mir_graph.cc @@ -391,7 +391,7 @@ bool MIRGraph::IsBadMonitorExitCatch(NarrowDexOffset monitor_exit_offset, switch (check_insn->Opcode()) { case Instruction::MOVE_WIDE: wide = true; - // Intentional fall-through. + FALLTHROUGH_INTENDED; case Instruction::MOVE_OBJECT: case Instruction::MOVE: dest = check_insn->VRegA_12x(); @@ -399,7 +399,7 @@ bool MIRGraph::IsBadMonitorExitCatch(NarrowDexOffset monitor_exit_offset, case Instruction::MOVE_WIDE_FROM16: wide = true; - // Intentional fall-through. + FALLTHROUGH_INTENDED; case Instruction::MOVE_OBJECT_FROM16: case Instruction::MOVE_FROM16: dest = check_insn->VRegA_22x(); @@ -407,7 +407,7 @@ bool MIRGraph::IsBadMonitorExitCatch(NarrowDexOffset monitor_exit_offset, case Instruction::MOVE_WIDE_16: wide = true; - // Intentional fall-through. + FALLTHROUGH_INTENDED; case Instruction::MOVE_OBJECT_16: case Instruction::MOVE_16: dest = check_insn->VRegA_32x(); @@ -417,7 +417,7 @@ bool MIRGraph::IsBadMonitorExitCatch(NarrowDexOffset monitor_exit_offset, case Instruction::GOTO_16: case Instruction::GOTO_32: check_insn = check_insn->RelativeAt(check_insn->GetTargetOffset()); - // Intentional fall-through. + FALLTHROUGH_INTENDED; default: return check_insn->Opcode() == Instruction::MONITOR_EXIT && check_insn->VRegA_11x() == monitor_reg; |