Cleanup: Simplify CompiledData::Unit structure to always include the string table at the end

Change-Id: Iae86b8f4dc0dc67c14974472f627e28d6795369f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

4 files changed, 28 insertions, 14 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index d22116fc83..a96fafac9b 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -1523,7 +1523,7 @@ QV4::CompiledData::Unit *QmlUnitGenerator::generate(Document &output)
         objectsSize += signalTableSize;
     }
 
-    const int totalSize = unitSize + importSize + objectOffsetTableSize + objectsSize;
+    const int totalSize = unitSize + importSize + objectOffsetTableSize + objectsSize + output.jsGenerator.stringTable.sizeOfTableAndData();
     char *data = (char*)malloc(totalSize);
     memcpy(data, jsUnit, unitSize);
     if (jsUnit != compilationUnit->data)
@@ -1539,6 +1539,8 @@ QV4::CompiledData::Unit *QmlUnitGenerator::generate(Document &output)
     qmlUnit->offsetToObjects = unitSize + importSize;
     qmlUnit->nObjects = output.objects.count();
     qmlUnit->indexOfRootObject = output.indexOfRootObject;
+    qmlUnit->offsetToStringTable = totalSize - output.jsGenerator.stringTable.sizeOfTableAndData();
+    qmlUnit->stringTableSize = output.jsGenerator.stringTable.stringCount();
 
     // write imports
     char *importPtr = data + qmlUnit->offsetToImports;
@@ -1630,6 +1632,8 @@ QV4::CompiledData::Unit *QmlUnitGenerator::generate(Document &output)
         }
     }
 
+    output.jsGenerator.stringTable.serialize(qmlUnit);
+
     return qmlUnit;
 }
 
diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp
index a5530e167d..d242fb7b3a 100644
--- a/src/qml/compiler/qv4compileddata.cpp
+++ b/src/qml/compiler/qv4compileddata.cpp
@@ -181,7 +181,7 @@ void CompilationUnit::markObjects(QV4::ExecutionEngine *e)
 
 Unit *CompilationUnit::createUnitData(QmlIR::Document *irDocument)
 {
-    return irDocument->jsGenerator.generateUnit();
+    return irDocument->jsGenerator.generateUnit(QV4::Compiler::JSUnitGenerator::GenerateWithoutStringTable);
 }
 
 QString Binding::valueAsString(const Unit *unit) const
diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp
index d6f0bc8335..22107c4bd1 100644
--- a/src/qml/compiler/qv4compiler.cpp
+++ b/src/qml/compiler/qv4compiler.cpp
@@ -66,8 +66,11 @@ void QV4::Compiler::StringTableGenerator::clear()
     stringDataSize = 0;
 }
 
-void QV4::Compiler::StringTableGenerator::serialize(uint *stringTable, char *dataStart, char *stringData)
+void QV4::Compiler::StringTableGenerator::serialize(CompiledData::Unit *unit)
 {
+    char *dataStart = reinterpret_cast<char *>(unit);
+    uint *stringTable = reinterpret_cast<uint *>(dataStart + unit->offsetToStringTable);
+    char *stringData = dataStart + unit->offsetToStringTable + unit->stringTableSize * sizeof(uint);
     for (int i = 0; i < strings.size(); ++i) {
         stringTable[i] = stringData - dataStart;
         const QString &qstr = strings.at(i);
@@ -190,7 +193,7 @@ int QV4::Compiler::JSUnitGenerator::registerJSClass(int count, IR::ExprList *arg
     return jsClasses.size() - 1;
 }
 
-QV4::CompiledData::Unit *QV4::Compiler::JSUnitGenerator::generateUnit()
+QV4::CompiledData::Unit *QV4::Compiler::JSUnitGenerator::generateUnit(GeneratorOption option)
 {
     registerString(irModule->fileName);
     foreach (QV4::IR::Function *f, irModule->functions) {
@@ -214,7 +217,7 @@ QV4::CompiledData::Unit *QV4::Compiler::JSUnitGenerator::generateUnit()
         functionDataSize += QV4::CompiledData::Function::calculateSize(f->formals.size(), f->locals.size(), f->nestedFunctions.size(), qmlIdDepsCount, qmlPropertyDepsCount);
     }
 
-    const int totalSize = unitSize + functionDataSize + jsClassDataSize + stringTable.sizeOfTableAndData();
+    const int totalSize = unitSize + functionDataSize + jsClassDataSize + (option == GenerateWithStringTable ? stringTable.sizeOfTableAndData() : 0);
     char *data = (char *)malloc(totalSize);
     memset(data, 0, totalSize);
     QV4::CompiledData::Unit *unit = (QV4::CompiledData::Unit*)data;
@@ -234,8 +237,13 @@ QV4::CompiledData::Unit *QV4::Compiler::JSUnitGenerator::generateUnit()
     unit->offsetToConstantTable = unit->offsetToRegexpTable + unit->regexpTableSize * CompiledData::RegExp::calculateSize();
     unit->jsClassTableSize = jsClasses.count();
     unit->offsetToJSClassTable = unit->offsetToConstantTable + unit->constantTableSize * sizeof(ReturnedValue);
-    unit->stringTableSize = stringTable.stringCount();
-    unit->offsetToStringTable = unitSize + functionDataSize + jsClassDataSize;
+    if (option == GenerateWithStringTable) {
+        unit->stringTableSize = stringTable.stringCount();
+        unit->offsetToStringTable = unitSize + functionDataSize + jsClassDataSize;
+    } else {
+        unit->stringTableSize = 0;
+        unit->offsetToStringTable = 0;
+    }
     unit->indexOfRootFunction = -1;
     unit->sourceFileIndex = getStringId(irModule->fileName);
     unit->nImports = 0;
@@ -287,11 +295,8 @@ QV4::CompiledData::Unit *QV4::Compiler::JSUnitGenerator::generateUnit()
     }
 
     // write strings and string table
-    {
-        uint *stringTablePtr = (uint *)(data + unit->offsetToStringTable);
-        char *string = data + unit->offsetToStringTable + unit->stringTableSize * sizeof(uint);
-        stringTable.serialize(stringTablePtr, data, string);
-    }
+    if (option == GenerateWithStringTable)
+        stringTable.serialize(unit);
 
     return unit;
 }
diff --git a/src/qml/compiler/qv4compiler_p.h b/src/qml/compiler/qv4compiler_p.h
index 109998dc33..7b349caaf8 100644
--- a/src/qml/compiler/qv4compiler_p.h
+++ b/src/qml/compiler/qv4compiler_p.h
@@ -63,7 +63,7 @@ struct Q_QML_PRIVATE_EXPORT StringTableGenerator {
 
     void clear();
 
-    void serialize(uint *stringTable, char *dataStart, char *stringData);
+    void serialize(CompiledData::Unit *unit);
 
 private:
     QHash<QString, int> stringToId;
@@ -90,7 +90,12 @@ struct Q_QML_PRIVATE_EXPORT JSUnitGenerator {
 
     int registerJSClass(int count, IR::ExprList *args);
 
-    QV4::CompiledData::Unit *generateUnit();
+    enum GeneratorOption {
+        GenerateWithStringTable,
+        GenerateWithoutStringTable
+    };
+
+    QV4::CompiledData::Unit *generateUnit(GeneratorOption option = GenerateWithStringTable);
     // Returns bytes written
     int writeFunction(char *f, int index, IR::Function *irFunction);