summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@qt.io>2017-06-21 13:18:51 +0200
committerLars Knoll <lars.knoll@qt.io>2017-06-21 11:22:56 +0000
commit5972060469e362ec848ba14cc3ef070dec86023a (patch)
tree40b6494038a10c6ea7e7b5de724d57c2080371a4
parent8d51f7c440f8cd01382b852bb17e4d2f7f6077bb (diff)
downloadqtdeclarative-5972060469e362ec848ba14cc3ef070dec86023a.tar.gz
Fix invalid assert
When the "this" in store is a non-temp, we can't compare the base to the source value's Param. What needs to be checked is not the base, but the "b" value, which hold a (possibly loaded) value. Change-Id: I43ed77db70a3f075b40f01dd66f16a0046467ce1 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/qml/compiler/qv4codegen.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index e9518181ba..e0a2ddd66e 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -3370,7 +3370,7 @@ void Codegen::Reference::store(const Reference &r) const
return;
}
Moth::Param x = r.asRValue();
- Q_ASSERT(base != x);
+ Q_ASSERT(b != x);
Instruction::Move move;
move.source = x;
move.result = b;