diff options
Diffstat (limited to 'src/qml/compiler/qv4isel_masm.cpp')
| -rw-r--r-- | src/qml/compiler/qv4isel_masm.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp index 98558bf9bc..859f6b918f 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) { |