V4 JIT: do not generate inline fall-back code for strings types.

Change-Id: I30ac6fcbc7d03f412ff03e87f2ecf61fd2617108
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp
index 98558bf..859f6b9 100644 (file)
--- 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) {