diff options
| author | Erik Verbruggen <[email protected]> | 2013-10-04 13:47:12 +0200 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2013-10-10 09:54:18 +0200 |
| commit | dcec03166c93fcbc9aa1ca97f53a6f436faa482c (patch) | |
| tree | 1a03031c77549908c77f4817b9b00aca34b4ca98 /src/qml/compiler/qv4isel_masm.cpp | |
| parent | 42aa10adc93068acbcdc503342c8db92c5b5b899 (diff) | |
V4 JIT: do not generate inline fall-back code for strings types.
Change-Id: I30ac6fcbc7d03f412ff03e87f2ecf61fd2617108
Reviewed-by: Lars Knoll <[email protected]>
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) { |