diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-11-24 16:33:51 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2014-11-24 17:27:42 +0000 |
| commit | 321b987ef037c44c0ed4e0e82661c88959a6239f (patch) | |
| tree | b333364689dbd22753d9fb543bd0a53541aa632f /compiler/dex/global_value_numbering.cc | |
| parent | 8173e4776afac6e8da01c42ddab09b635769415f (diff) | |
| download | art-321b987ef037c44c0ed4e0e82661c88959a6239f.zip art-321b987ef037c44c0ed4e0e82661c88959a6239f.tar.gz art-321b987ef037c44c0ed4e0e82661c88959a6239f.tar.bz2 | |
Further cleanup using dex_instruction_utils.h.
Change-Id: I85aa9e7d744b37ee3d2531c50470cd3fa87dc864
Diffstat (limited to 'compiler/dex/global_value_numbering.cc')
| -rw-r--r-- | compiler/dex/global_value_numbering.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/dex/global_value_numbering.cc b/compiler/dex/global_value_numbering.cc index 3daeb10..578952b 100644 --- a/compiler/dex/global_value_numbering.cc +++ b/compiler/dex/global_value_numbering.cc @@ -104,10 +104,7 @@ LocalValueNumbering* GlobalValueNumbering::PrepareBasicBlock(BasicBlock* bb, if (bb->catch_entry) { merge_type = LocalValueNumbering::kCatchMerge; } else if (bb->last_mir_insn != nullptr && - (bb->last_mir_insn->dalvikInsn.opcode == Instruction::RETURN_VOID || - bb->last_mir_insn->dalvikInsn.opcode == Instruction::RETURN || - bb->last_mir_insn->dalvikInsn.opcode == Instruction::RETURN_OBJECT || - bb->last_mir_insn->dalvikInsn.opcode == Instruction::RETURN_WIDE) && + IsInstructionReturn(bb->last_mir_insn->dalvikInsn.opcode) && bb->GetFirstNonPhiInsn() == bb->last_mir_insn) { merge_type = LocalValueNumbering::kReturnMerge; } |