diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-30 00:16:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-30 00:16:40 +0200 |
| commit | 0bf14044178d7aa212ac7e28530f9077790a3df4 (patch) | |
| tree | 4c403571abbc5e18c6962ba67d9cb584d8e121c4 /src/qml/jit/qv4assembler_p.h | |
| parent | 0aea009425242417bffdb171c8eca02ff52f4a7b (diff) | |
| parent | 79cfc8788d6267eeb263983466ba21758f618dcd (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/quick/qquicktext/tst_qquicktext.cpp
Change-Id: I241cd418bb7e7b95e0a0a2ee4c465d48be2a5582
Diffstat (limited to 'src/qml/jit/qv4assembler_p.h')
| -rw-r--r-- | src/qml/jit/qv4assembler_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/jit/qv4assembler_p.h b/src/qml/jit/qv4assembler_p.h index a5028bc683..234254513d 100644 --- a/src/qml/jit/qv4assembler_p.h +++ b/src/qml/jit/qv4assembler_p.h @@ -380,6 +380,11 @@ public: void addPatch(DataLabelPtr patch, IR::BasicBlock *target); void generateCJumpOnNonZero(RegisterID reg, IR::BasicBlock *currentBlock, IR::BasicBlock *trueBlock, IR::BasicBlock *falseBlock); +#ifdef QV4_USE_64_BIT_VALUE_ENCODING + void generateCJumpOnCompare(RelationalCondition cond, RegisterID left, TrustedImm64 right, + IR::BasicBlock *currentBlock, IR::BasicBlock *trueBlock, + IR::BasicBlock *falseBlock); +#endif void generateCJumpOnCompare(RelationalCondition cond, RegisterID left, TrustedImm32 right, IR::BasicBlock *currentBlock, IR::BasicBlock *trueBlock, IR::BasicBlock *falseBlock); |