diff options
| author | J-P Nurmi <[email protected]> | 2016-09-30 02:59:43 +0000 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2016-09-30 03:38:12 +0000 |
| commit | e4134cfd8086a78c61a46fdfb908ade27c8d9840 (patch) | |
| tree | 9514153cd35f7335238b08586671445283abbef6 /src/qml/jit/qv4isel_masm_p.h | |
| parent | 0ca693407473eb9457cdf8f9d4be32c9d4968ced (diff) | |
| parent | 0bf14044178d7aa212ac7e28530f9077790a3df4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/qml/jit/qv4isel_masm_p.h')
| -rw-r--r-- | src/qml/jit/qv4isel_masm_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jit/qv4isel_masm_p.h b/src/qml/jit/qv4isel_masm_p.h index 366d510072..1e6ac1f51c 100644 --- a/src/qml/jit/qv4isel_masm_p.h +++ b/src/qml/jit/qv4isel_masm_p.h @@ -172,8 +172,8 @@ protected: bool visitCJumpSInt32(IR::AluOp op, IR::Expr *left, IR::Expr *right, IR::BasicBlock *iftrue, IR::BasicBlock *iffalse); void visitCJumpStrict(IR::Binop *binop, IR::BasicBlock *trueBlock, IR::BasicBlock *falseBlock); - bool visitCJumpStrictNullUndefined(IR::Type nullOrUndef, IR::Binop *binop, - IR::BasicBlock *trueBlock, IR::BasicBlock *falseBlock); + bool visitCJumpStrictNull(IR::Binop *binop, IR::BasicBlock *trueBlock, IR::BasicBlock *falseBlock); + bool visitCJumpStrictUndefined(IR::Binop *binop, IR::BasicBlock *trueBlock, IR::BasicBlock *falseBlock); bool visitCJumpStrictBool(IR::Binop *binop, IR::BasicBlock *trueBlock, IR::BasicBlock *falseBlock); bool visitCJumpNullUndefined(IR::Type nullOrUndef, IR::Binop *binop, IR::BasicBlock *trueBlock, IR::BasicBlock *falseBlock); |