From ae8c798a0a01334d1af33a59acdaeda8898a9f5c Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Mon, 6 May 2019 13:21:17 +0200
Subject: Drop some dead bootstrap code

The dependencies are only hashed if a dependencyHasher is given. This is
generally not the case when compiling ahead of time. There is also no
need to hide the declaration of DependentTypesHasher from the bootstrap
code.

Change-Id: I0ea74c3079656ce1fe353956999820916c8ff626
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/qml/compiler/qqmlirbuilder.cpp   | 25 +++++--------------------
 src/qml/compiler/qv4compileddata.cpp | 11 ++++-------
 src/qml/compiler/qv4compileddata_p.h |  7 +++----
 src/qml/qml/qqmltypeloader.cpp       | 10 ++++++----
 4 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index 9ac1a8b5ac..cd3953044b 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -48,12 +48,6 @@
 #include <QCryptographicHash>
 #include <cmath>
 
-#ifndef V4_BOOTSTRAP
-#include <private/qqmlglobal_p.h>
-#include <private/qqmltypeloader_p.h>
-#include <private/qqmlengine_p.h>
-#endif
-
 #ifdef CONST
 #undef CONST
 #endif
@@ -61,11 +55,6 @@
 QT_USE_NAMESPACE
 
 static const quint32 emptyStringIndex = 0;
-
-#if 0 //ndef V4_BOOTSTRAP
-DEFINE_BOOL_CONFIG_OPTION(lookupHints, QML_LOOKUP_HINTS);
-#endif // V4_BOOTSTRAP
-
 using namespace QmlIR;
 
 #define COMPILE_EXCEPTION(location, desc) \
@@ -1586,18 +1575,14 @@ void QmlUnitGenerator::generate(Document &output, const QV4::CompiledData::Depen
         // definitely not suitable for StaticData access.
         createdUnit->flags &= ~QV4::CompiledData::Unit::StaticData;
 
-#ifndef V4_BOOTSTRAP
         if (dependencyHasher) {
-            QCryptographicHash hash(QCryptographicHash::Md5);
-            if (dependencyHasher(&hash)) {
-                QByteArray checksum = hash.result();
-                Q_ASSERT(checksum.size() == sizeof(createdUnit->dependencyMD5Checksum));
-                memcpy(createdUnit->dependencyMD5Checksum, checksum.constData(), sizeof(createdUnit->dependencyMD5Checksum));
+            const QByteArray checksum = dependencyHasher();
+            if (checksum.size() == sizeof(createdUnit->dependencyMD5Checksum)) {
+                memcpy(createdUnit->dependencyMD5Checksum, checksum.constData(),
+                       sizeof(createdUnit->dependencyMD5Checksum));
             }
         }
-#else
-        Q_UNUSED(dependencyHasher);
-#endif
+
         createdUnit->sourceFileIndex = output.jsGenerator.stringTable.getStringId(output.jsModule.fileName);
         createdUnit->finalUrlIndex = output.jsGenerator.stringTable.getStringId(output.jsModule.finalUrl);
 
diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp
index a78094f17c..5f2993c364 100644
--- a/src/qml/compiler/qv4compileddata.cpp
+++ b/src/qml/compiler/qv4compileddata.cpp
@@ -425,13 +425,10 @@ bool CompilationUnit::verifyChecksum(const DependentTypesHasher &dependencyHashe
         }
         return true;
     }
-    QCryptographicHash hash(QCryptographicHash::Md5);
-    if (!dependencyHasher(&hash))
-        return false;
-    QByteArray checksum = hash.result();
-    Q_ASSERT(checksum.size() == sizeof(data->dependencyMD5Checksum));
-    return memcmp(data->dependencyMD5Checksum, checksum.constData(),
-                  sizeof(data->dependencyMD5Checksum)) == 0;
+    const QByteArray checksum = dependencyHasher();
+    return checksum.size() == sizeof(data->dependencyMD5Checksum)
+            && memcmp(data->dependencyMD5Checksum, checksum.constData(),
+                      sizeof(data->dependencyMD5Checksum)) == 0;
 }
 
 QStringList CompilationUnit::moduleRequests() const
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index f604cc0d46..3e89c25c7d 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -51,6 +51,7 @@
 //
 
 #include <QtCore/qstring.h>
+#include <QtCore/qcryptographichash.h>
 #include <QVector>
 #include <QStringList>
 #include <QHash>
@@ -1057,12 +1058,10 @@ struct ResolvedTypeReferenceMap: public QMap<int, ResolvedTypeReference*>
 {
     bool addToHash(QCryptographicHash *hash, QQmlEngine *engine) const;
 };
-
-using DependentTypesHasher = std::function<bool(QCryptographicHash *)>;
-#else
-struct DependentTypesHasher {};
 #endif
 
+using DependentTypesHasher = std::function<QByteArray()>;
+
 // index is per-object binding index
 typedef QVector<QQmlPropertyData*> BindingPropertyData;
 
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index d694909c7c..2233af6cd8 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -2357,10 +2357,12 @@ void QQmlTypeData::done()
 
     QQmlEngine *const engine = typeLoader()->engine();
 
-    const auto dependencyHasher = [engine, &resolvedTypeCache, this](QCryptographicHash *hash) {
-        if (!resolvedTypeCache.addToHash(hash, engine))
-            return false;
-        return ::addTypeReferenceChecksumsToHash(m_compositeSingletons, hash, engine);
+    const auto dependencyHasher = [engine, &resolvedTypeCache, this]() {
+        QCryptographicHash hash(QCryptographicHash::Md5);
+        return (resolvedTypeCache.addToHash(&hash, engine)
+                    && ::addTypeReferenceChecksumsToHash(m_compositeSingletons, &hash, engine))
+                ? hash.result()
+                : QByteArray();
     };
 
     // verify if any dependencies changed if we're using a cache
-- 
cgit v1.2.3