diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-10 10:06:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-10 10:06:39 +0200 |
| commit | 0932a59971f606f07b41da19f3974d51b7008180 (patch) | |
| tree | 191aab5e88e7b4ddf3724dcbf3b8229512e433f2 /src/qml/jit/qv4regalloc.cpp | |
| parent | aca40a8361996e22ec4f020b803404031a0f0d76 (diff) | |
| parent | cd0efef04bd45eca6cc72b5a000e4e5586153290 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Part of 0e053528 was reverted in the merge, about lastTimestamp. It
will be applied later in separate commit.
qmltest::shadersource-dynamic-sourceobject::test_endresult() was
blacklisted on linux.
Conflicts:
.qmake.conf
tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
tests/auto/qmltest/BLACKLIST
tests/auto/qmltest/qmltest.pro
Task-number: QTBUG-53590
Task-number: QTBUG-53971
Change-Id: I48af90b49a3c7b29de16f4178a04807f8bc05130
Diffstat (limited to 'src/qml/jit/qv4regalloc.cpp')
| -rw-r--r-- | src/qml/jit/qv4regalloc.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/jit/qv4regalloc.cpp b/src/qml/jit/qv4regalloc.cpp index 131e0a5b0a..c21f52ecd3 100644 --- a/src/qml/jit/qv4regalloc.cpp +++ b/src/qml/jit/qv4regalloc.cpp @@ -839,6 +839,7 @@ public: , _assignedSpillSlots(assignedSpillSlots) , _intRegs(intRegs) , _fpRegs(fpRegs) + , _currentStmt(0) { _unprocessed = unprocessed; _liveAtStart.reserve(function->basicBlockCount()); |