| 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 e884a9dbcede98187c6e5b0fc7e39fb9f503849e..b5bc18bdc9655987e4ba8e339883275d94fe80ad 100644
|
| --- a/src/ia32/lithium-gap-resolver-ia32.cc
|
| +++ b/src/ia32/lithium-gap-resolver-ia32.cc
|
| @@ -306,10 +306,10 @@ void LGapResolver::EmitMove(int index) {
|
| LConstantOperand* constant_source = LConstantOperand::cast(source);
|
| if (destination->IsRegister()) {
|
| Register dst = cgen_->ToRegister(destination);
|
| - if (cgen_->IsSmi(constant_source)) {
|
| - __ Set(dst, cgen_->ToSmiImmediate(constant_source));
|
| - } else if (cgen_->IsInteger32(constant_source)) {
|
| - __ Set(dst, cgen_->ToInteger32Immediate(constant_source));
|
| + Representation r = cgen_->IsSmi(constant_source)
|
| + ? Representation::Smi() : Representation::Integer32();
|
| + if (cgen_->IsInteger32(constant_source)) {
|
| + __ Set(dst, cgen_->ToImmediate(constant_source, r));
|
| } else {
|
| __ LoadObject(dst, cgen_->ToHandle(constant_source));
|
| }
|
| @@ -339,10 +339,10 @@ void LGapResolver::EmitMove(int index) {
|
| } else {
|
| ASSERT(destination->IsStackSlot());
|
| Operand dst = cgen_->ToOperand(destination);
|
| - if (cgen_->IsSmi(constant_source)) {
|
| - __ Set(dst, cgen_->ToSmiImmediate(constant_source));
|
| - } else if (cgen_->IsInteger32(constant_source)) {
|
| - __ Set(dst, cgen_->ToInteger32Immediate(constant_source));
|
| + Representation r = cgen_->IsSmi(constant_source)
|
| + ? Representation::Smi() : Representation::Integer32();
|
| + if (cgen_->IsInteger32(constant_source)) {
|
| + __ Set(dst, cgen_->ToImmediate(constant_source, r));
|
| } else {
|
| Register tmp = EnsureTempRegister();
|
| __ LoadObject(tmp, cgen_->ToHandle(constant_source));
|
|
|