diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 13:49:51 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 14:18:16 +0000 |
| commit | 9fd39f34f7512d199a1f68dcff4f50e469897e31 (patch) | |
| tree | 3cde144acfaeaa7063146c529d19726692750375 | |
| parent | 71d32b4195b81c6786d8fef85960628b77ff6860 (diff) | |
Update the expected size of QV4::CompiledData::Unit
ebda8170a removed a member. Thanks to the padding, the size of the
structure remained the same on 64-bit, but not on 32-bit. Removing
the padding gives now the same size on both.
Task-number: QTBUG-63109
Change-Id: If87ad21a1c94e63643b0cd52f95e244364f6e73d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/qml/compiler/qv4compileddata_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h index 6e6d641d94..84777b3533 100644 --- a/src/qml/compiler/qv4compileddata_p.h +++ b/src/qml/compiler/qv4compileddata_p.h @@ -667,8 +667,6 @@ struct Unit LEUInt32 nObjects; LEUInt32 offsetToObjects; - LEUInt32 padding; - const Import *importAt(int idx) const { return reinterpret_cast<const Import*>((reinterpret_cast<const char *>(this)) + offsetToImports + idx * sizeof(Import)); } @@ -733,7 +731,7 @@ struct Unit } }; -static_assert(sizeof(Unit) == 152, "Unit structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target"); +static_assert(sizeof(Unit) == 144, "Unit structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target"); struct TypeReference { |