Index: src/arm/lithium-codegen-arm.cc |
diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc |
index 40208065e2c15126618951528ed1949458813a61..5ff9ed90824f0214109d93a604f42778949d9c0d 100644 |
--- a/src/arm/lithium-codegen-arm.cc |
+++ b/src/arm/lithium-codegen-arm.cc |
@@ -431,7 +431,7 @@ Register LCodeGen::EmitLoadRegister(LOperand* op, Register scratch) { |
} else if (r.IsDouble()) { |
Abort(kEmitLoadRegisterUnsupportedDoubleImmediate); |
} else { |
- ASSERT(r.IsTagged()); |
+ ASSERT(r.IsSmiOrTagged()); |
__ LoadObject(scratch, literal); |
} |
return scratch; |
@@ -1583,10 +1583,7 @@ void LCodeGen::DoMulI(LMulI* instr) { |
instr->hydrogen()->CheckFlag(HValue::kBailoutOnMinusZero); |
if (right_op->IsConstantOperand() && !can_overflow) { |
- // Use optimized code for specific constants. |
- int32_t constant = ToRepresentation( |
- LConstantOperand::cast(right_op), |
- instr->hydrogen()->right()->representation()); |
+ int32_t constant = ToInteger32(LConstantOperand::cast(right_op)); |
if (bailout_on_minus_zero && (constant < 0)) { |
// The case of a null constant will be handled separately. |