Index: src/arm/lithium-arm.cc |
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc |
index 4768cc82a41fa68a0cee12d94f0624f4a8c84ccb..483a92361c945e9f5156232ac7f53b8e008ba1a7 100644 |
--- a/src/arm/lithium-arm.cc |
+++ b/src/arm/lithium-arm.cc |
@@ -1305,8 +1305,8 @@ LInstruction* LChunkBuilder::DoBitwise(HBitwise* instr) { |
ASSERT(instr->left()->representation().IsInteger32()); |
ASSERT(instr->right()->representation().IsInteger32()); |
- LOperand* left = UseRegisterAtStart(instr->LeastConstantOperand()); |
- LOperand* right = UseOrConstantAtStart(instr->MostConstantOperand()); |
+ LOperand* left = UseRegisterAtStart(instr->BetterLeftOperand()); |
+ LOperand* right = UseOrConstantAtStart(instr->BetterRightOperand()); |
return DefineAsRegister(new(zone()) LBitI(left, right)); |
} else { |
ASSERT(instr->representation().IsTagged()); |
@@ -1484,15 +1484,15 @@ LInstruction* LChunkBuilder::DoMul(HMul* instr) { |
ASSERT(instr->left()->representation().IsInteger32()); |
ASSERT(instr->right()->representation().IsInteger32()); |
LOperand* left; |
- LOperand* right = UseOrConstant(instr->MostConstantOperand()); |
+ LOperand* right = UseOrConstant(instr->BetterRightOperand()); |
LOperand* temp = NULL; |
if (instr->CheckFlag(HValue::kBailoutOnMinusZero) && |
(instr->CheckFlag(HValue::kCanOverflow) || |
!right->IsConstantOperand())) { |
- left = UseRegister(instr->LeastConstantOperand()); |
+ left = UseRegister(instr->BetterLeftOperand()); |
temp = TempRegister(); |
} else { |
- left = UseRegisterAtStart(instr->LeastConstantOperand()); |
+ left = UseRegisterAtStart(instr->BetterLeftOperand()); |
} |
LMulI* mul = new(zone()) LMulI(left, right, temp); |
if (instr->CheckFlag(HValue::kCanOverflow) || |
@@ -1602,8 +1602,8 @@ LInstruction* LChunkBuilder::DoAdd(HAdd* instr) { |
if (instr->representation().IsInteger32()) { |
ASSERT(instr->left()->representation().IsInteger32()); |
ASSERT(instr->right()->representation().IsInteger32()); |
- LOperand* left = UseRegisterAtStart(instr->LeastConstantOperand()); |
- LOperand* right = UseOrConstantAtStart(instr->MostConstantOperand()); |
+ LOperand* left = UseRegisterAtStart(instr->BetterLeftOperand()); |
+ LOperand* right = UseOrConstantAtStart(instr->BetterRightOperand()); |
LAddI* add = new(zone()) LAddI(left, right); |
LInstruction* result = DefineAsRegister(add); |
if (instr->CheckFlag(HValue::kCanOverflow)) { |
@@ -1634,8 +1634,8 @@ LInstruction* LChunkBuilder::DoMathMinMax(HMathMinMax* instr) { |
if (instr->representation().IsInteger32()) { |
ASSERT(instr->left()->representation().IsInteger32()); |
ASSERT(instr->right()->representation().IsInteger32()); |
- left = UseRegisterAtStart(instr->LeastConstantOperand()); |
- right = UseOrConstantAtStart(instr->MostConstantOperand()); |
+ left = UseRegisterAtStart(instr->BetterLeftOperand()); |
+ right = UseOrConstantAtStart(instr->BetterRightOperand()); |
} else { |
ASSERT(instr->representation().IsDouble()); |
ASSERT(instr->left()->representation().IsDouble()); |