1 files changed, 33 insertions, 13 deletions

diff --git a/src/qml/common/qv4compileddata_p.h b/src/qml/common/qv4compileddata_p.h
index ff08f03683..f87578daa1 100644
--- a/src/qml/common/qv4compileddata_p.h
+++ b/src/qml/common/qv4compileddata_p.h
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE
 // Also change the comment behind the number to describe the latest change. This has the added
 // benefit that if another patch changes the version too, it will result in a merge conflict, and
 // not get removed silently.
-#define QV4_DATA_STRUCTURE_VERSION 0x38 // Added context to translation data
+#define QV4_DATA_STRUCTURE_VERSION 0x39 // Changed CodeOffsetToLine(AndStatement) struct
 
 class QIODevice;
 class QQmlTypeNameCache;
@@ -237,11 +237,12 @@ struct String
 
 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");
 
-struct CodeOffsetToLine {
+struct CodeOffsetToLineAndStatement {
     quint32_le codeOffset;
-    quint32_le line;
+    qint32_le line; // signed because debug instructions get negative line numbers
+    quint32_le statement;
 };
-static_assert(sizeof(CodeOffsetToLine) == 8, "CodeOffsetToLine 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(CodeOffsetToLineAndStatement) == 12, "CodeOffsetToLineAndStatement structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct Block
 {
@@ -325,8 +326,8 @@ struct Function
     ParameterType returnType;
     quint32_le localsOffset;
     quint16_le nLocals;
-    quint16_le nLineNumbers;
-    size_t lineNumberOffset() const { return localsOffset + nLocals * sizeof(quint32); }
+    quint16_le nLineAndStatementNumbers;
+    size_t lineAndStatementNumberOffset() const { return localsOffset + nLocals * sizeof(quint32); }
     quint32_le nestedFunctionIndex; // for functions that only return a single closure, used in signal handlers
 
     quint32_le nRegisters;
@@ -337,7 +338,10 @@ struct Function
     quint16_le firstTemporalDeadZoneRegister;
     quint16_le sizeOfRegisterTemporalDeadZone;
 
-    size_t labelInfosOffset() const { return lineNumberOffset() + nLineNumbers * sizeof(CodeOffsetToLine); }
+    size_t labelInfosOffset() const
+    {
+        return lineAndStatementNumberOffset() + nLineAndStatementNumbers * sizeof(CodeOffsetToLineAndStatement);
+    }
 
     // Keep all unaligned data at the end
     quint8 flags;
@@ -346,9 +350,21 @@ struct Function
     //    quint32 formalsIndex[nFormals]
     //    quint32 localsIndex[nLocals]
 
-    const Parameter *formalsTable() const { return reinterpret_cast<const Parameter *>(reinterpret_cast<const char *>(this) + formalsOffset); }
-    const quint32_le *localsTable() const { return reinterpret_cast<const quint32_le *>(reinterpret_cast<const char *>(this) + localsOffset); }
-    const CodeOffsetToLine *lineNumberTable() const { return reinterpret_cast<const CodeOffsetToLine *>(reinterpret_cast<const char *>(this) + lineNumberOffset()); }
+    const Parameter *formalsTable() const
+    {
+        return reinterpret_cast<const Parameter *>(
+                    reinterpret_cast<const char *>(this) + formalsOffset);
+    }
+    const quint32_le *localsTable() const
+    {
+        return reinterpret_cast<const quint32_le *>(
+                    reinterpret_cast<const char *>(this) + localsOffset);
+    }
+    const CodeOffsetToLineAndStatement *lineAndStatementNumberTable() const
+    {
+        return reinterpret_cast<const CodeOffsetToLineAndStatement *>(
+                    reinterpret_cast<const char *>(this) + lineAndStatementNumberOffset());
+    }
 
     // --- QQmlPropertyCacheCreator interface
     const Parameter *formalsBegin() const { return formalsTable(); }
@@ -359,9 +375,13 @@ struct Function
 
     const char *code() const { return reinterpret_cast<const char *>(this) + codeOffset; }
 
-    static int calculateSize(int nFormals, int nLocals, int nLines, int nInnerfunctions, int labelInfoSize, int codeSize) {
-        int trailingData = nFormals * sizeof(Parameter) + (nLocals + nInnerfunctions + labelInfoSize)*sizeof (quint32)
-                + nLines*sizeof(CodeOffsetToLine);
+    static int calculateSize(
+            int nFormals, int nLocals, int nLinesAndStatements, int nInnerfunctions,
+            int labelInfoSize, int codeSize)
+    {
+        int trailingData = nFormals * sizeof(Parameter)
+                + (nLocals + nInnerfunctions  + labelInfoSize) * sizeof (quint32)
+                + nLinesAndStatements * sizeof(CodeOffsetToLineAndStatement);
         size_t size = align(align(sizeof(Function)) + size_t(trailingData)) + align(codeSize);
         Q_ASSERT(size < INT_MAX);
         return int(size);