diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-14 17:02:59 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-17 08:36:03 +0000 |
| commit | cbdf28b078bbe0ce4136013ecdba1511fc926601 (patch) | |
| tree | 8bfcd8139734a90803cef286105ca94af6336b85 /src/qml/memory/qv4heap_p.h | |
| parent | 53547ee6b3a828969a3e2283a6ea5b3141f065d5 (diff) | |
Protect ExecutionContext member usage against word size differences
Ensure the offsets we're taking from ExecutionContext members in the JIT
code generator can be translated from host architecture sizes to target
architecture, using assertions and a memory layout that we already have
in the dev branch with commit 4de7e48ab160dacc7a09360e80264eac4945a8f4.
Task-number: QTBUG-58666
Change-Id: I26cdbd1ddb995b116624fab16f7caba5d21c13b5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/memory/qv4heap_p.h')
| -rw-r--r-- | src/qml/memory/qv4heap_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/memory/qv4heap_p.h b/src/qml/memory/qv4heap_p.h index 8285ef4de7..bdb5bef92b 100644 --- a/src/qml/memory/qv4heap_p.h +++ b/src/qml/memory/qv4heap_p.h @@ -160,6 +160,12 @@ struct Q_QML_EXPORT Base { #endif }; V4_ASSERT_IS_TRIVIAL(Base) +// This class needs to consist only of pointer sized members to allow +// for a size/offset translation when cross-compiling between 32- and +// 64-bit. +Q_STATIC_ASSERT(std::is_standard_layout<Base>::value); +Q_STATIC_ASSERT(offsetof(Base, vt) == 0); +Q_STATIC_ASSERT(sizeof(Base) == QT_POINTER_SIZE); template <typename T> struct Pointer { |