1 files changed, 16 insertions, 5 deletions
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index 3fd9fdf74b..23e33247a8 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -73,7 +73,7 @@
 QT_BEGIN_NAMESPACE
 
 // Bump this whenever the compiler data structures change in an incompatible way.
-#define QV4_DATA_STRUCTURE_VERSION 0x20
+#define QV4_DATA_STRUCTURE_VERSION 0x21
 
 class QIODevice;
 class QQmlPropertyCache;
@@ -288,10 +288,16 @@ struct Function
     quint16_le nRegisters;
     Location location;
 
+    quint32_le nLabelInfos;
+    size_t labelInfosOffset() const { return lineNumberOffset() + nLineNumbers * sizeof(CodeOffsetToLine); }
+
+    typedef quint16_le TraceInfoCount;
+    TraceInfoCount nTraceInfos;
+    static constexpr TraceInfoCount NoTracing() { return TraceInfoCount::max(); }
+
     // Keep all unaligned data at the end
     quint8 flags;
     quint8 padding1;
-    quint16 padding2;
 
     //    quint32 formalsIndex[nFormals]
     //    quint32 localsIndex[nLocals]
@@ -305,10 +311,13 @@ struct Function
     const quint32_le *formalsEnd() const { return formalsTable() + nFormals; }
     // ---
 
+    const quint32_le *labelInfoTable() const { return reinterpret_cast<const quint32_le *>(reinterpret_cast<const char *>(this) + labelInfosOffset()); }
+
     const char *code() const { return reinterpret_cast<const char *>(this) + codeOffset; }
 
-    static int calculateSize(int nFormals, int nLocals, int nLines, int nInnerfunctions, int codeSize) {
-        int trailingData = (nFormals + nLocals + nInnerfunctions)*sizeof (quint32) + nLines*sizeof(CodeOffsetToLine);
+    static int calculateSize(int nFormals, int nLocals, int nLines, int nInnerfunctions, int labelInfoSize, int codeSize) {
+        int trailingData = (nFormals + nLocals + nInnerfunctions + labelInfoSize)*sizeof (quint32)
+                + nLines*sizeof(CodeOffsetToLine);
         size_t size = align(align(sizeof(Function)) + size_t(trailingData)) + align(codeSize);
         Q_ASSERT(size < INT_MAX);
         return int(size);
@@ -318,7 +327,7 @@ struct Function
         return (a + 7) & ~size_t(7);
     }
 };
-static_assert(sizeof(Function) == 48, "Function 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(Function) == 52, "Function structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct Method {
     enum Type {
@@ -424,6 +433,7 @@ struct Q_QML_PRIVATE_EXPORT Binding
         Type_Boolean,
         Type_Number,
         Type_String,
+        Type_Null,
         Type_Translation,
         Type_TranslationById,
         Type_Script,
@@ -455,6 +465,7 @@ struct Q_QML_PRIVATE_EXPORT Binding
         quint32_le compiledScriptIndex; // used when Type_Script
         quint32_le objectIndex;
         quint32_le translationDataIndex; // used when Type_Translation
+        quint32 nullMarker;
     } value;
     quint32_le stringIndex; // Set for Type_String and Type_Script (the latter because of script strings)