diff options
author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 18:19:53 +0200 |
---|---|---|
committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 18:19:53 +0200 |
commit | f1536d179ade768923de91e53c87fd02ad87fc8a (patch) | |
tree | 4491f8069db66b43cf7d0503ddbf25308f6c9f43 /src | |
parent | 17ee404f2678684674b9c5c0c523602953146e37 (diff) | |
parent | 098e09c1ce436eb40f9b9f2f0b8c186d20d7627d (diff) |
Merge remote-tracking branch 'origin/stable' into 5.3
Change-Id: Id783915b0139a90ecfb99f8298b1ff5cf506a1dd
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/compiler/qv4jsir.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/qml/compiler/qv4jsir.cpp b/src/qml/compiler/qv4jsir.cpp index 5d30d6e3b9..f81985c07d 100644 --- a/src/qml/compiler/qv4jsir.cpp +++ b/src/qml/compiler/qv4jsir.cpp @@ -1049,6 +1049,11 @@ void BasicBlock::setStatements(const QVector<Stmt *> &newStatements) { Q_ASSERT(!isRemoved()); Q_ASSERT(newStatements.size() >= _statements.size()); + // FIXME: this gets quite inefficient for large basic-blocks, so this function/case should be re-worked. + foreach (Stmt *s, _statements) { + if (!newStatements.contains(s)) + s->destroyData(); + } _statements = newStatements; } @@ -1088,18 +1093,21 @@ void BasicBlock::insertStatementBeforeTerminator(Stmt *stmt) void BasicBlock::replaceStatement(int index, Stmt *newStmt) { Q_ASSERT(!isRemoved()); + _statements[index]->destroyData(); _statements[index] = newStmt; } void BasicBlock::removeStatement(Stmt *stmt) { Q_ASSERT(!isRemoved()); + stmt->destroyData(); _statements.remove(_statements.indexOf(stmt)); } void BasicBlock::removeStatement(int idx) { Q_ASSERT(!isRemoved()); + _statements[idx]->destroyData(); _statements.remove(idx); } |