diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-25 23:35:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 23:35:34 +0100 |
| commit | cc1c3d0e2be6dfea6befebdc5f25e519e3fe79b2 (patch) | |
| tree | f160486b34c9157f42e12b23f2e0a3dd9aa2ef1b /src/qml/jit/qv4isel_masm.cpp | |
| parent | 7fa08472d32055a3d6e8b775b843f38ef65e9ce6 (diff) | |
| parent | 4fae8ff1e73eeb48734b28a9c846fbdff1c2ffe1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Conflicts:
src/qml/compiler/qv4ssa.cpp
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
src/quick/util/qquickprofiler_p.h
Change-Id: I11a89c2a166115d6697adfba09928805643e709e
Diffstat (limited to 'src/qml/jit/qv4isel_masm.cpp')
| -rw-r--r-- | src/qml/jit/qv4isel_masm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jit/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp index 859ecfbe64..d047623ac9 100644 --- a/src/qml/jit/qv4isel_masm.cpp +++ b/src/qml/jit/qv4isel_masm.cpp @@ -1877,7 +1877,7 @@ bool InstructionSelection::visitCJumpStrictUndefined(IR::Binop *binop, Assembler::RelationalCondition cond = binop->op == IR::OpStrictEqual ? Assembler::Equal : Assembler::NotEqual; - const Assembler::RegisterID tagReg = Assembler::ScratchRegister; + const Assembler::RegisterID tagReg = Assembler::ReturnValueRegister; #ifdef QV4_USE_64_BIT_VALUE_ENCODING Assembler::Pointer addr = _as->loadAddress(Assembler::ScratchRegister, varSrc); _as->load64(addr, tagReg); @@ -1976,7 +1976,7 @@ bool InstructionSelection::visitCJumpNullUndefined(IR::Type nullOrUndef, IR::Bin Assembler::Pointer tagAddr = _as->loadAddress(Assembler::ScratchRegister, varSrc); tagAddr.offset += 4; - const Assembler::RegisterID tagReg = Assembler::ScratchRegister; + const Assembler::RegisterID tagReg = Assembler::ReturnValueRegister; _as->load32(tagAddr, tagReg); if (binop->op == IR::OpNotEqual) |