diff options
| author | Bill Buzbee <buzbee@android.com> | 2014-03-25 14:29:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-25 14:29:51 +0000 |
| commit | 889d079baea1d9ee488b5915de9aec4e0d02e2a0 (patch) | |
| tree | 7d3820ec3ff2adbe34a3dbf8d5e45f2cfd36a2d3 | |
| parent | 716426fe40f5de972084de0e5bd6395b2617ec12 (diff) | |
| parent | ee40aa4650d7d000335ccfcb2fbb742acfb1f1c3 (diff) | |
| download | android_art-889d079baea1d9ee488b5915de9aec4e0d02e2a0.tar.gz android_art-889d079baea1d9ee488b5915de9aec4e0d02e2a0.tar.bz2 android_art-889d079baea1d9ee488b5915de9aec4e0d02e2a0.zip | |
Merge "An argument is handled incorrectly for add-int/lit8 during optimization phase"
| -rw-r--r-- | compiler/dex/local_value_numbering.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/dex/local_value_numbering.cc b/compiler/dex/local_value_numbering.cc index 45167a83f7..8dbc2bb9c3 100644 --- a/compiler/dex/local_value_numbering.cc +++ b/compiler/dex/local_value_numbering.cc @@ -482,9 +482,9 @@ uint16_t LocalValueNumbering::GetValueNumber(MIR* mir) { case Instruction::SHL_INT_LIT8: case Instruction::SHR_INT_LIT8: case Instruction::USHR_INT_LIT8: { - // Same as res = op + 2 operands, except use vB as operand 2 + // Same as res = op + 2 operands, except use vC as operand 2 uint16_t operand1 = GetOperandValue(mir->ssa_rep->uses[0]); - uint16_t operand2 = LookupValue(Instruction::CONST, mir->dalvikInsn.vB, 0, 0); + uint16_t operand2 = LookupValue(Instruction::CONST, mir->dalvikInsn.vC, 0, 0); res = LookupValue(opcode, operand1, operand2, NO_VALUE); SetOperandValue(mir->ssa_rep->defs[0], res); } |