From dcec03166c93fcbc9aa1ca97f53a6f436faa482c Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Fri, 4 Oct 2013 13:47:12 +0200 Subject: [PATCH] V4 JIT: do not generate inline fall-back code for strings types. Change-Id: I30ac6fcbc7d03f412ff03e87f2ecf61fd2617108 Reviewed-by: Lars Knoll --- src/qml/compiler/qv4isel_masm.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp index 98558bf..859f6b9 100644 --- a/src/qml/compiler/qv4isel_masm.cpp +++ b/src/qml/compiler/qv4isel_masm.cpp @@ -1372,7 +1372,9 @@ void InstructionSelection::binop(V4IR::AluOp oper, V4IR::Expr *leftSource, V4IR: return; } - Assembler::Jump done = genInlineBinop(oper, leftSource, rightSource, target); + Assembler::Jump done; + if (leftSource->type != V4IR::StringType && rightSource->type != V4IR::StringType) + done = genInlineBinop(oper, leftSource, rightSource, target); const Assembler::BinaryOperationInfo& info = Assembler::binaryOperation(oper); if (info.fallbackImplementation) { -- 2.7.4