aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2014-08-14 10:56:54 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2014-08-14 15:58:12 +0200
commitccb1eb743d11e7e6658e6ad72c12b39d39b4c9eb (patch)
tree46a5c1066e2fb77dc041b0a47ea87ca673ffe0eb /src/qml
parent35d76da20ab2afd4db01ea231d9a90d5d598c24b (diff)
V4 JIT: fix int32 to double conversion code
Missing else: two (nearly identical) conversions would get generated. Change-Id: I745120f81d42bf28fbce7ab6a62da909a8e14458 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml')
-rw-r--r--src/qml/jit/qv4isel_masm_p.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/jit/qv4isel_masm_p.h b/src/qml/jit/qv4isel_masm_p.h
index 264ad2d179..008734e99e 100644
--- a/src/qml/jit/qv4isel_masm_p.h
+++ b/src/qml/jit/qv4isel_masm_p.h
@@ -187,9 +187,11 @@ private:
_as->convertInt32ToDouble(_as->loadAddress(Assembler::ReturnValueRegister, sourceTemp),
(Assembler::FPRegisterID) targetTemp->index);
}
+ } else {
+ _as->convertInt32ToDouble(_as->toInt32Register(source, Assembler::ScratchRegister),
+ (Assembler::FPRegisterID) targetTemp->index);
}
- _as->convertInt32ToDouble(_as->toInt32Register(source, Assembler::ScratchRegister),
- (Assembler::FPRegisterID) targetTemp->index);
+
return;
}
}