diff options
| author | Erik Verbruggen <[email protected]> | 2013-11-18 15:33:19 +0100 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2013-11-19 13:00:37 +0100 |
| commit | 48c45418cce7a377eb9117b2f120d5d5aaf3530a (patch) | |
| tree | 718992832395fa5721879c95757f1a1b2208e6f0 /src/qml/compiler/qv4ssa.cpp | |
| parent | cac9989643d54b15ea0b8e53889336b429e4504d (diff) | |
V4: remove failing assert and fix code.
Assert failed for cases where the node’s ancestor with lowest
semi-dominator number was not the same as the parent. The test case
exemplifies this.
Task-number: QTBUG-34792
Change-Id: Ie6847b22a27211801bff7479bfcbfaf329c6005a
Reviewed-by: Fawzi Mohamed <[email protected]>
Diffstat (limited to 'src/qml/compiler/qv4ssa.cpp')
| -rw-r--r-- | src/qml/compiler/qv4ssa.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp index 62f65c0c9c..6b1169d30a 100644 --- a/src/qml/compiler/qv4ssa.cpp +++ b/src/qml/compiler/qv4ssa.cpp @@ -323,9 +323,9 @@ class DominatorTree { link(p, n); foreach (BasicBlock *v, bucket[p]) { BasicBlock *y = ancestorWithLowestSemi(v); - Q_ASSERT(semi[y] == p); - if (semi[y] == semi[v]) - idom[v] = p; + BasicBlock *semi_v = semi[v]; + if (semi[y] == semi_v) + idom[v] = semi_v; else samedom[v] = y; } |