diff options
| author | Erik Verbruggen <erik.verbruggen@me.com> | 2013-08-29 16:08:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 16:54:03 +0200 |
| commit | 39a92ca0d473b845247f801a546de84baff15bfe (patch) | |
| tree | 37789b4959e1497fbef06112f9a9a20688c0839b /src/qml/compiler/qv4jsir_p.h | |
| parent | 526f111b059e18414e3a03c7f9a2b8c2ed65be7a (diff) | |
V4 IR: fix Temp equality, and its use in type inference.
Change-Id: Ibf14d8835517981eda41ee768446da49965248be
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/compiler/qv4jsir_p.h')
| -rw-r--r-- | src/qml/compiler/qv4jsir_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4jsir_p.h b/src/qml/compiler/qv4jsir_p.h index 12f69ac92e..cf82e28f1e 100644 --- a/src/qml/compiler/qv4jsir_p.h +++ b/src/qml/compiler/qv4jsir_p.h @@ -380,7 +380,7 @@ struct Temp: Expr { }; inline bool operator==(const Temp &t1, const Temp &t2) Q_DECL_NOTHROW -{ return t1.index == t2.index && t1.scope == t2.scope && t1.kind == t2.kind; } +{ return t1.index == t2.index && t1.scope == t2.scope && t1.kind == t2.kind && t1.type == t2.type; } inline uint qHash(const Temp &t, uint seed = 0) Q_DECL_NOTHROW { return t.index ^ (t.kind | (t.scope << 3)) ^ seed; } |