diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 10:08:49 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 10:08:50 +0100 |
| commit | e7c316504770ce357b2c73be485cdd8c1da9c4c1 (patch) | |
| tree | b49032420022617396a83da310ebe01b38cda8f9 /src/qml/jit | |
| parent | 87265c7ab8743ece92262cd6b79bbba9dddd1fe1 (diff) | |
| parent | e3948955c961972d34483e7da9c2908f5cb84420 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I7623438dde316ae1e97802f91991f2e7ccc205a5
Diffstat (limited to 'src/qml/jit')
| -rw-r--r-- | src/qml/jit/qv4baselineassembler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jit/qv4baselineassembler.cpp b/src/qml/jit/qv4baselineassembler.cpp index f6b745632b..c62d6e5388 100644 --- a/src/qml/jit/qv4baselineassembler.cpp +++ b/src/qml/jit/qv4baselineassembler.cpp @@ -444,12 +444,12 @@ public: void moveReg(Address sourceRegAddress, Address destRegAddress) { - load32(sourceRegAddress, ReturnValueRegisterValue); + load32(sourceRegAddress, ScratchRegister); + store32(ScratchRegister, destRegAddress); sourceRegAddress.offset += 4; - load32(sourceRegAddress, ReturnValueRegisterTag); - store32(ReturnValueRegisterValue, destRegAddress); destRegAddress.offset += 4; - store32(ReturnValueRegisterTag, destRegAddress); + load32(sourceRegAddress, ScratchRegister); + store32(ScratchRegister, destRegAddress); } void loadString(int stringId) |