Move unit checksum generation into qv4compiler

Only the compiler ever has to do this, and we want the structure
definition for the compiled data as a common header.

Change-Id: Ie5c6d6c9dcd180dea79f54d0f7d10f3fc50fa20e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 
 
 
 
 

6 files changed, 24 insertions, 24 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index cb46a59713..9d09842af4 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -1749,7 +1749,7 @@ void QmlUnitGenerator::generate(Document &output, const QV4::CompiledData::Depen
         jsUnit->unitSize += totalSize;
         memcpy(jsUnit->qmlUnit(), qmlUnit, totalSize);
         free(qmlUnit);
-        jsUnit->generateChecksum();
+        QV4::Compiler::JSUnitGenerator::generateUnitChecksum(jsUnit);
         qmlUnit = jsUnit->qmlUnit();
     }
 
diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp
index a7e0909b16..e548085873 100644
--- a/src/qml/compiler/qv4compileddata.cpp
+++ b/src/qml/compiler/qv4compileddata.cpp
@@ -41,7 +41,6 @@
 #include <private/qv4staticvalue_p.h>
 #include <private/qqmlirbuilder_p.h>
 #include <QCoreApplication>
-#include <QCryptographicHash>
 #include <QScopeGuard>
 #include <QFileInfo>
 
@@ -161,24 +160,6 @@ void CompilationUnit::unlink()
     runtimeClasses = nullptr;
 }
 
-void Unit::generateChecksum()
-{
-#ifndef QT_CRYPTOGRAPHICHASH_ONLY_SHA1
-    QCryptographicHash hash(QCryptographicHash::Md5);
-
-    const int checksummableDataOffset = offsetof(QV4::CompiledData::Unit, md5Checksum) + sizeof(md5Checksum);
-
-    const char *dataPtr = reinterpret_cast<const char *>(this) + checksummableDataOffset;
-    hash.addData(dataPtr, unitSize - checksummableDataOffset);
-
-    QByteArray checksum = hash.result();
-    Q_ASSERT(checksum.size() == sizeof(md5Checksum));
-    memcpy(md5Checksum, checksum.constData(), sizeof(md5Checksum));
-#else
-    memset(md5Checksum, 0, sizeof(md5Checksum));
-#endif
-}
-
 }
 
 }
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index 933d91f2a6..b8ae2536dc 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -51,7 +51,6 @@
 //
 
 #include <QtCore/qstring.h>
-#include <QtCore/qcryptographichash.h>
 #include <QtCore/qscopeguard.h>
 
 #if QT_CONFIG(temporaryfile)
@@ -832,8 +831,6 @@ struct Unit
     char libraryVersionHash[QmlCompileHashSpace];
 
     char md5Checksum[16]; // checksum of all bytes following this field.
-    void generateChecksum();
-
     char dependencyMD5Checksum[16];
 
     enum : unsigned int {
diff --git a/src/qml/compiler/qv4compiler.cpp b/src/qml/compiler/qv4compiler.cpp
index 592f5731ca..b378c294b7 100644
--- a/src/qml/compiler/qv4compiler.cpp
+++ b/src/qml/compiler/qv4compiler.cpp
@@ -126,6 +126,25 @@ void QV4::Compiler::StringTableGenerator::serialize(CompiledData::Unit *unit)
     }
 }
 
+void QV4::Compiler::JSUnitGenerator::generateUnitChecksum(QV4::CompiledData::Unit *unit)
+{
+#ifndef QT_CRYPTOGRAPHICHASH_ONLY_SHA1
+    QCryptographicHash hash(QCryptographicHash::Md5);
+
+    const int checksummableDataOffset
+            = offsetof(QV4::CompiledData::Unit, md5Checksum) + sizeof(unit->md5Checksum);
+
+    const char *dataPtr = reinterpret_cast<const char *>(unit) + checksummableDataOffset;
+    hash.addData(dataPtr, unit->unitSize - checksummableDataOffset);
+
+    QByteArray checksum = hash.result();
+    Q_ASSERT(checksum.size() == sizeof(unit->md5Checksum));
+    memcpy(unit->md5Checksum, checksum.constData(), sizeof(unit->md5Checksum));
+#else
+    memset(unit->md5Checksum, 0, sizeof(unit->md5Checksum));
+#endif
+}
+
 QV4::Compiler::JSUnitGenerator::JSUnitGenerator(QV4::Compiler::Module *module)
     : module(module)
 {
@@ -392,7 +411,7 @@ QV4::CompiledData::Unit *QV4::Compiler::JSUnitGenerator::generateUnit(GeneratorO
     if (option == GenerateWithStringTable)
         stringTable.serialize(unit);
 
-    unit->generateChecksum();
+    generateUnitChecksum(unit);
 
     return unit;
 }
diff --git a/src/qml/compiler/qv4compiler_p.h b/src/qml/compiler/qv4compiler_p.h
index 49e334bb81..f5884f6478 100644
--- a/src/qml/compiler/qv4compiler_p.h
+++ b/src/qml/compiler/qv4compiler_p.h
@@ -103,6 +103,8 @@ private:
 };
 
 struct Q_QML_PRIVATE_EXPORT JSUnitGenerator {
+    static void generateUnitChecksum(CompiledData::Unit *unit);
+
     struct MemberInfo {
         QString name;
         bool isAccessor;
diff --git a/src/qml/jsruntime/qv4executablecompilationunit.cpp b/src/qml/jsruntime/qv4executablecompilationunit.cpp
index 1e725cbef7..86fd2e9171 100644
--- a/src/qml/jsruntime/qv4executablecompilationunit.cpp
+++ b/src/qml/jsruntime/qv4executablecompilationunit.cpp
@@ -60,6 +60,7 @@
 #include <QtCore/qstandardpaths.h>
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qscopeguard.h>
+#include <QtCore/qcryptographichash.h>
 
 #if defined(QML_COMPILE_HASH)
 #  ifdef Q_OS_LINUX