1 files changed, 37 insertions, 1 deletions

diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index 08170e1c3b..6d81db23e0 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -317,6 +317,33 @@ struct Function
 };
 static_assert(sizeof(Function) == 80, "Function structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
+struct Class
+{
+    quint32_le nameIndex;
+    quint32_le scopeIndex;
+    quint32_le constructorFunction;
+    quint32_le nStaticMethods;
+    quint32_le nMethods;
+    quint32_le nameTableOffset;
+    quint32_le methodTableOffset;
+
+    const quint32_le *nameTable() const { return reinterpret_cast<const quint32_le *>(reinterpret_cast<const char *>(this) + nameTableOffset); }
+    const quint32_le *methodTable() const { return reinterpret_cast<const quint32_le *>(reinterpret_cast<const char *>(this) + methodTableOffset); }
+
+    static int calculateSize(int nStaticMethods, int nMethods) {
+        int trailingData = (nStaticMethods + nMethods) * 2 * sizeof(quint32);
+        size_t size = align(sizeof(Class) + trailingData);
+        Q_ASSERT(size < INT_MAX);
+        return int(size);
+    }
+
+    static size_t align(size_t a) {
+        return (a + 7) & ~size_t(7);
+    }
+};
+static_assert(sizeof(Class) == 28, "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
 
 struct Q_QML_EXPORT TranslationData {
@@ -747,6 +774,8 @@ struct Unit
     quint32_le offsetToStringTable;
     quint32_le functionTableSize;
     quint32_le offsetToFunctionTable;
+    quint32_le classTableSize;
+    quint32_le offsetToClassTable;
     quint32_le blockTableSize;
     quint32_le offsetToBlockTable;
     quint32_le lookupTableSize;
@@ -810,6 +839,7 @@ struct Unit
     }
 
     const quint32_le *functionOffsetTable() const { return reinterpret_cast<const quint32_le*>((reinterpret_cast<const char *>(this)) + offsetToFunctionTable); }
+    const quint32_le *classOffsetTable() const { return reinterpret_cast<const quint32_le*>((reinterpret_cast<const char *>(this)) + offsetToClassTable); }
     const quint32_le *blockOffsetTable() const { return reinterpret_cast<const quint32_le*>((reinterpret_cast<const char *>(this)) + offsetToBlockTable); }
 
     const Function *functionAt(int idx) const {
@@ -818,6 +848,12 @@ struct Unit
         return reinterpret_cast<const Function*>(reinterpret_cast<const char *>(this) + offset);
     }
 
+    const Class *classAt(int idx) const {
+        const quint32_le *offsetTable = classOffsetTable();
+        const quint32_le offset = offsetTable[idx];
+        return reinterpret_cast<const Class *>(reinterpret_cast<const char *>(this) + offset);
+    }
+
     const Block *blockAt(int idx) const {
         const quint32_le *offsetTable = blockOffsetTable();
         const quint32_le offset = offsetTable[idx];
@@ -842,7 +878,7 @@ struct Unit
     }
 };
 
-static_assert(sizeof(Unit) == 200, "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) == 208, "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
 {