Index: src/ia32/lithium-gap-resolver-ia32.cc |
diff --git a/src/ia32/lithium-gap-resolver-ia32.cc b/src/ia32/lithium-gap-resolver-ia32.cc |
index fcf1f913785b83ebae7244412683940bdbe58cfa..510d9f1dc6cc2025a6b85908dbcecb150cc26e05 100644 |
--- a/src/ia32/lithium-gap-resolver-ia32.cc |
+++ b/src/ia32/lithium-gap-resolver-ia32.cc |
@@ -303,14 +303,24 @@ void LGapResolver::EmitMove(int index) { |
} |
} else if (source->IsConstantOperand()) { |
- ASSERT(destination->IsRegister() || destination->IsStackSlot()); |
- Immediate src = cgen_->ToImmediate(source); |
+ LConstantOperand* constant_source = LConstantOperand::cast(source); |
if (destination->IsRegister()) { |
Register dst = cgen_->ToRegister(destination); |
- __ Set(dst, src); |
+ if (cgen_->IsInteger32(constant_source)) { |
+ __ Set(dst, cgen_->ToInteger32Immediate(constant_source)); |
+ } else { |
+ __ LoadObject(dst, cgen_->ToHandle(constant_source)); |
+ } |
} else { |
+ ASSERT(destination->IsStackSlot()); |
Operand dst = cgen_->ToOperand(destination); |
- __ Set(dst, src); |
+ if (cgen_->IsInteger32(constant_source)) { |
+ __ Set(dst, cgen_->ToInteger32Immediate(constant_source)); |
+ } else { |
+ Register tmp = EnsureTempRegister(); |
+ __ LoadObject(tmp, cgen_->ToHandle(constant_source)); |
+ __ mov(dst, tmp); |
+ } |
} |
} else if (source->IsDoubleRegister()) { |