diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-30 11:11:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-30 11:26:26 +0200 |
| commit | 22cc4d6707132c3914b43ca3ed5c7d1f354d84b6 (patch) | |
| tree | 733f3529205e43865070edab5416e6f1b0b4c9f4 /src/qml/jit/qv4assembler_p.h | |
| parent | e321dc6bee3645e2492914f99fc30f8019e9383b (diff) | |
| parent | 44900962268c50aa1f9823e71d5b75cfa9e7ea4f (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/qml/jit/qv4assembler.cpp
src/qml/jit/qv4assembler_p.h
Change-Id: Ibfe69610ccd1f275f181b2bd87feece4ba221e50
Diffstat (limited to 'src/qml/jit/qv4assembler_p.h')
| -rw-r--r-- | src/qml/jit/qv4assembler_p.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/qml/jit/qv4assembler_p.h b/src/qml/jit/qv4assembler_p.h index addbfc12a3..d4a18ae886 100644 --- a/src/qml/jit/qv4assembler_p.h +++ b/src/qml/jit/qv4assembler_p.h @@ -1387,13 +1387,6 @@ public: RegisterSizeDependentOps::emitWriteBarrier(this, dest); } - void storeValue(QV4::Primitive value, RegisterID destination) - { - Q_UNUSED(value); - Q_UNUSED(destination); - Q_UNREACHABLE(); - } - void storeValue(QV4::Primitive value, Address destination, WriteBarrier::Type barrier) { RegisterSizeDependentOps::storeValue(this, value, destination, barrier); @@ -1463,7 +1456,7 @@ public: template <int ArgumentIndex, typename Parameter> struct SizeOnStack { - enum { Size = Select<ArgumentIndex >= RegisterArgumentCount, sizeof(void*), 0>::Chosen }; + enum { Size = Select<ArgumentIndex >= RegisterArgumentCount, RegisterSize, 0>::Chosen }; }; template <int ArgumentIndex> |