From ccb1eb743d11e7e6658e6ad72c12b39d39b4c9eb Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Thu, 14 Aug 2014 10:56:54 +0200 Subject: [PATCH] V4 JIT: fix int32 to double conversion code Missing else: two (nearly identical) conversions would get generated. Change-Id: I745120f81d42bf28fbce7ab6a62da909a8e14458 Reviewed-by: Simon Hausmann --- src/qml/jit/qv4isel_masm_p.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qml/jit/qv4isel_masm_p.h b/src/qml/jit/qv4isel_masm_p.h index 264ad2d..008734e 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; } } -- 2.7.4