aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2013-09-10 11:58:29 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-10 20:13:41 +0200
commit995d70bacd34f2def6fca81a69a752f9f6f488a0 (patch)
treef9a3c1d75b54273cd41f406cdb4ef199281c2912
parentd68e1bc83666a29bcec6c67af79ba7fca4757e80 (diff)
V4: Fix build in release with forced asserts
Change-Id: I7419b10223ebb28cc54cbb595818509a7384ac6a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-rw-r--r--src/qml/compiler/qv4regalloc.cpp2
-rw-r--r--src/qml/jsruntime/qv4vme_moth.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4regalloc.cpp b/src/qml/compiler/qv4regalloc.cpp
index acf09461ae..1c8bb66fc1 100644
--- a/src/qml/compiler/qv4regalloc.cpp
+++ b/src/qml/compiler/qv4regalloc.cpp
@@ -812,8 +812,8 @@ private:
foreach (const Move &m, _moves)
if (m.needsSwap)
++swapCount;
-#endif
Q_ASSERT(output.size() == _moves.size() + swapCount);
+#endif
}
#ifdef DEBUG_REGALLOC
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index d5416105fa..5049dffe7d 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -183,7 +183,9 @@ static inline QV4::Value *getValueRef(QV4::ExecutionContext *context,
return c->locals + index;
} else if (param.isTemp()) {
VMSTATS(paramIsTemp);
+#if !defined(QT_NO_DEBUG)
Q_ASSERT(param.index < stackSize);
+#endif
return stack + param.index;
} else if (param.isScopedLocal()) {
VMSTATS(paramIsScopedLocal);