diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 15:22:12 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 15:22:12 +0100 |
| commit | 6924a8b5be31300d7b3cfc85abce621bad032de9 (patch) | |
| tree | 3f84769a4ec113703a6e589ddd4222a6118124a4 /src/qml/compiler/qv4regalloc.cpp | |
| parent | 2f83ded7f7adf8ebfd4ae0479c4cca99ffe94a4e (diff) | |
| parent | a0494a2092d7512a2b0d568a21058ed77b0cea11 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id265682aa7db9be1c0b305ab3207b2c932a25a9f
Diffstat (limited to 'src/qml/compiler/qv4regalloc.cpp')
| -rw-r--r-- | src/qml/compiler/qv4regalloc.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4regalloc.cpp b/src/qml/compiler/qv4regalloc.cpp index 7996b134a1..f95cd55b04 100644 --- a/src/qml/compiler/qv4regalloc.cpp +++ b/src/qml/compiler/qv4regalloc.cpp @@ -916,8 +916,9 @@ private: } } if (!moveFrom) { +#if defined(QT_NO_DEBUG) Q_UNUSED(lifeTimeHole); -#if !defined(QT_NO_DEBUG) +#else Q_ASSERT(!_info->isPhiTarget(it->temp()) || it->isSplitFromInterval() || lifeTimeHole); if (_info->def(it->temp()) != successorStart && !it->isSplitFromInterval()) { const int successorEnd = successor->statements.last()->id; @@ -1495,6 +1496,7 @@ int RegisterAllocator::nextUse(const Temp &t, int startPosition) const static inline void insertSorted(QVector<LifeTimeInterval> &intervals, const LifeTimeInterval &newInterval) { + newInterval.validate(); for (int i = 0, ei = intervals.size(); i != ei; ++i) { if (LifeTimeInterval::lessThan(newInterval, intervals.at(i))) { intervals.insert(i, newInterval); |