1 files changed, 23 insertions, 11 deletions

diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index cc4a96d5c0..ce54e4fae4 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -71,7 +71,7 @@
 QT_BEGIN_NAMESPACE
 
 // Bump this whenever the compiler data structures change in an incompatible way.
-#define QV4_DATA_STRUCTURE_VERSION 0x11
+#define QV4_DATA_STRUCTURE_VERSION 0x13
 
 class QIODevice;
 class QQmlPropertyCache;
@@ -115,10 +115,6 @@ struct TableIterator
     bool operator!=(const TableIterator &rhs) const { return index != rhs.index; }
 };
 
-#if defined(Q_CC_MSVC) || defined(Q_CC_GNU)
-#pragma pack(push, 1)
-#endif
-
 struct Location
 {
     union {
@@ -134,6 +130,7 @@ struct Location
                (line == other.line && column < other.column);
     }
 };
+static_assert(sizeof(Location) == 4, "Location structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct RegExp
 {
@@ -150,6 +147,7 @@ struct RegExp
 
     RegExp() : _dummy(0) { }
 };
+static_assert(sizeof(RegExp) == 4, "RegExp structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct Lookup
 {
@@ -169,6 +167,7 @@ struct Lookup
 
     Lookup() : _dummy(0) { }
 };
+static_assert(sizeof(Lookup) == 4, "Lookup structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct JSClassMember
 {
@@ -180,6 +179,7 @@ struct JSClassMember
 
     JSClassMember() : _dummy(0) { }
 };
+static_assert(sizeof(JSClassMember) == 4, "JSClassMember structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct JSClass
 {
@@ -188,6 +188,7 @@ struct JSClass
 
     static int calculateSize(int nMembers) { return (sizeof(JSClass) + nMembers * sizeof(JSClassMember) + 7) & ~7; }
 };
+static_assert(sizeof(JSClass) == 4, "JSClass structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct String
 {
@@ -198,6 +199,7 @@ struct String
         return (sizeof(String) + str.length() * sizeof(quint16) + 7) & ~0x7;
     }
 };
+static_assert(sizeof(String) == 4, "String structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 // Function is aligned on an 8-byte boundary to make sure there are no bus errors or penalties
 // for unaligned access. The ordering of the fields is also from largest to smallest.
@@ -241,6 +243,8 @@ struct Function
 
     // Keep all unaligned data at the end
     quint8 flags;
+    quint8 padding1;
+    quint16_le padding2;
 
     const quint32_le *formalsTable() const { return reinterpret_cast<const quint32_le *>(reinterpret_cast<const char *>(this) + formalsOffset); }
     const quint32_le *localsTable() const { return reinterpret_cast<const quint32_le *>(reinterpret_cast<const char *>(this) + localsOffset); }
@@ -259,6 +263,7 @@ struct Function
         return (sizeof(Function) + (nFormals + nLocals + nInnerfunctions + nIdObjectDependencies + 2 * nPropertyDependencies) * sizeof(quint32) + 7) & ~0x7;
     }
 };
+static_assert(sizeof(Function) == 72, "Function structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 // Qml data structures
 
@@ -266,6 +271,7 @@ struct Q_QML_EXPORT TranslationData {
     quint32_le commentIndex;
     qint32_le number;
 };
+static_assert(sizeof(TranslationData) == 8, "TranslationData structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct Q_QML_PRIVATE_EXPORT Binding
 {
@@ -312,6 +318,8 @@ struct Q_QML_PRIVATE_EXPORT Binding
     Location location;
     Location valueLocation;
 
+    quint32_le padding;
+
     bool isValueBinding() const
     {
         if (type == Type_AttachedProperty
@@ -391,6 +399,8 @@ struct Q_QML_PRIVATE_EXPORT Binding
 
 };
 
+static_assert(sizeof(Binding) == 32, "Binding structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
+
 struct EnumValue
 {
     quint32_le nameIndex;
@@ -428,6 +438,7 @@ struct Parameter
     quint32_le customTypeNameIndex;
     Location location;
 };
+static_assert(sizeof(Parameter) == 16, "Parameter structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct Signal
 {
@@ -452,6 +463,7 @@ struct Signal
     int parameterCount() const { return nParameters; }
     // ---
 };
+static_assert(sizeof(Signal) == 12, "Signal structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct Property
 {
@@ -472,6 +484,7 @@ struct Property
     quint32_le customTypeNameIndex; // If type >= Custom
     Location location;
 };
+static_assert(sizeof(Property) == 16, "Property structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct Alias {
     enum Flags : unsigned int {
@@ -501,6 +514,7 @@ struct Alias {
         return encodedMetaPropertyIndex == -1;
     }
 };
+static_assert(sizeof(Alias) == 20, "Alias structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct Object
 {
@@ -623,6 +637,7 @@ struct Object
     int namedObjectsInComponentCount() const { return nNamedObjectsInComponent; }
     // ---
 };
+static_assert(sizeof(Object) == 80, "Object structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct Import
 {
@@ -643,6 +658,7 @@ struct Import
 
     Import() { type = 0; uriIndex = 0; qualifierIndex = 0; majorVersion = 0; minorVersion = 0; }
 };
+static_assert(sizeof(Import) == 24, "Import structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 static const char magic_str[] = "qv4cdata";
 
@@ -693,7 +709,6 @@ struct Unit
     quint32_le offsetToImports;
     quint32_le nObjects;
     quint32_le offsetToObjects;
-    quint32_le indexOfRootObject;
 
     const Import *importAt(int idx) const {
         return reinterpret_cast<const Import*>((reinterpret_cast<const char *>(this)) + offsetToImports + idx * sizeof(Import));
@@ -759,9 +774,7 @@ struct Unit
     }
 };
 
-#if defined(Q_CC_MSVC) || defined(Q_CC_GNU)
-#pragma pack(pop)
-#endif
+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
 {
@@ -881,7 +894,7 @@ struct Q_QML_PRIVATE_EXPORT CompilationUnit : public CompilationUnitBase, public
 
     // QML specific fields
     QQmlPropertyCacheVector propertyCaches;
-    QQmlPropertyCache *rootPropertyCache() const { return propertyCaches.at(data->indexOfRootObject); }
+    QQmlPropertyCache *rootPropertyCache() const { return propertyCaches.at(/*root object*/0); }
 
     QQmlRefPointer<QQmlTypeNameCache> typeNameCache;
 
@@ -918,7 +931,6 @@ struct Q_QML_PRIVATE_EXPORT CompilationUnit : public CompilationUnitBase, public
     // --- interface for QQmlPropertyCacheCreator
     typedef Object CompiledObject;
     int objectCount() const { return data->nObjects; }
-    int rootObjectIndex() const { return data->indexOfRootObject; }
     const Object *objectAt(int index) const { return data->objectAt(index); }
     QString stringAt(int index) const { return data->stringAt(index); }