QtQml: Move type name cache into base CU

Change-Id: Ie3504f16b34859cdef72f8138e6058dcc2d1f58f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

2 files changed, 12 insertions, 6 deletions

diff --git a/src/qml/common/qv4compileddata.cpp b/src/qml/common/qv4compileddata.cpp
index 6087db9b92..253c9a5e77 100644
--- a/src/qml/common/qv4compileddata.cpp
+++ b/src/qml/common/qv4compileddata.cpp
@@ -3,6 +3,7 @@
 
 #include "qv4compileddata_p.h"
 
+#include <private/qqmltypenamecache_p.h>
 #include <private/qv4resolvedtypereference_p.h>
 
 #include <QtQml/qqmlfile.h>
@@ -39,6 +40,12 @@ bool ResolvedTypeReferenceMap::addToHash(
     return true;
 }
 
+CompilationUnit::CompilationUnit(
+        const Unit *unitData, const QString &fileName, const QString &finalUrlString)
+{
+    setUnitData(unitData, nullptr, fileName, finalUrlString);
+}
+
 CompilationUnit::~CompilationUnit()
 {
     qDeleteAll(resolvedTypes);
diff --git a/src/qml/common/qv4compileddata_p.h b/src/qml/common/qv4compileddata_p.h
index 7e768cd589..5d4c7747d1 100644
--- a/src/qml/common/qv4compileddata_p.h
+++ b/src/qml/common/qv4compileddata_p.h
@@ -1487,6 +1487,7 @@ struct CompilationUnit final : public QQmlRefCounted<CompilationUnit>
     QVector<BindingPropertyData> bindingPropertyDataPerObject;
 
     ResolvedTypeReferenceMap resolvedTypes;
+    QQmlRefPointer<QQmlTypeNameCache> typeNameCache;
 
     QQmlPropertyCacheVector propertyCaches;
 
@@ -1495,12 +1496,6 @@ struct CompilationUnit final : public QQmlRefCounted<CompilationUnit>
 public:
     using CompiledObject = CompiledData::Object;
 
-    CompilationUnit(const Unit *unitData = nullptr, const QString &fileName = QString(),
-                    const QString &finalUrlString = QString())
-    {
-        setUnitData(unitData, nullptr, fileName, finalUrlString);
-    }
-
     explicit CompilationUnit(const Unit *unitData, const QQmlPrivate::AOTCompiledFunction *aotCompiledFunctions,
                              const QString &fileName = QString(), const QString &finalUrlString = QString())
         : CompilationUnit(unitData, fileName, finalUrlString)
@@ -1508,6 +1503,10 @@ public:
         this->aotCompiledFunctions = aotCompiledFunctions;
     }
 
+    Q_QML_EXPORT CompilationUnit(
+            const Unit *unitData = nullptr, const QString &fileName = QString(),
+            const QString &finalUrlString = QString());
+
     Q_QML_EXPORT ~CompilationUnit();
 
     const Unit *unitData() const { return data; }