diff options
| author | buzbee <buzbee@google.com> | 2014-11-25 20:09:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-25 20:09:03 +0000 |
| commit | f0c001465371279355eeb7633b67ffcc6f6738e5 (patch) | |
| tree | 078cd0518627673566727494b003fa671c027dc8 /compiler | |
| parent | 79d43fd465a302252062b1d6dbd32c8a7d79f266 (diff) | |
| parent | 6489d22a44ea7d135c142ee94925570d0333d5e7 (diff) | |
| download | art-f0c001465371279355eeb7633b67ffcc6f6738e5.tar.gz art-f0c001465371279355eeb7633b67ffcc6f6738e5.tar.bz2 art-f0c001465371279355eeb7633b67ffcc6f6738e5.zip | |
Merge "Quick compiler: handle embedded switch data"
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/mir_graph.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc index fdf01eba6..023abca64 100644 --- a/compiler/dex/mir_graph.cc +++ b/compiler/dex/mir_graph.cc @@ -765,8 +765,9 @@ void MIRGraph::InlineMethod(const DexFile::CodeItem* code_item, uint32_t access_ } else { DCHECK(cur_block->fall_through == NullBasicBlockId); DCHECK(cur_block->taken == NullBasicBlockId); - // Unreachable instruction, mark for no continuation. + // Unreachable instruction, mark for no continuation and end basic block. flags &= ~Instruction::kContinue; + FindBlock(current_offset_ + width, /* create */ true, /* immed_pred_block_p */ nullptr); } } else { cur_block->AppendMIR(insn); |