aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-13 22:12:48 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-13 22:12:48 +0200
commitbf332f213bce8ee4d139572baf0934620f5d8103 (patch)
tree4706f8378a16910999d3d6bbb6d1ab9cbf232a14 /src/qml/compiler
parentcf7166e266e20d3da940b9f58d8631d23cc38482 (diff)
parentc4a8d4a747559433e94d4af56c810ef86244d91f (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/qml/compiler')
-rw-r--r--src/qml/compiler/qv4jsir_p.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/compiler/qv4jsir_p.h b/src/qml/compiler/qv4jsir_p.h
index 398d5d5fa0..9eff90dd30 100644
--- a/src/qml/compiler/qv4jsir_p.h
+++ b/src/qml/compiler/qv4jsir_p.h
@@ -773,8 +773,6 @@ public:
BasicBlock *catchBlock;
QVector<BasicBlock *> in;
QVector<BasicBlock *> out;
- QBitArray liveIn;
- QBitArray liveOut;
QQmlJS::AST::SourceLocation nextLocation;
BasicBlock(Function *function, BasicBlock *containingLoop, BasicBlock *catcher)
@@ -785,7 +783,10 @@ public:
, _isExceptionHandler(false)
, _groupStart(false)
, _isRemoved(false)
- {}
+ {
+ in.reserve(2);
+ out.reserve(2);
+ }
~BasicBlock();
const QVector<Stmt *> &statements() const