| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index 07ca55f7f22b2cc1a70734af7f819aebac1561eb..99a97f9333208b237c3242f715e24a63c1a5e570 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.
|
|
|