Moved import cache and type resolution cache code

The code reads mostly from QQmlTypeData internal data structures, so
it's cleaner to move it there - we can remove the getters for these
internal fields.  And it also allows for re-use later when not using the
type compiler.

Change-Id: I36cfaf3f1cecd6c8b223ee08516884a07bc60d6c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 8 insertions, 51 deletions

diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp
index 357307fcea..add330d5ce 100644
--- a/src/qml/compiler/qqmltypecompiler.cpp
+++ b/src/qml/compiler/qqmltypecompiler.cpp
@@ -57,61 +57,17 @@
 
 QT_BEGIN_NAMESPACE
 
-QQmlTypeCompiler::QQmlTypeCompiler(QQmlEnginePrivate *engine, QQmlTypeData *typeData, QmlIR::Document *parsedQML)
-    : engine(engine)
+QQmlTypeCompiler::QQmlTypeCompiler(QQmlEnginePrivate *engine, QQmlTypeData *typeData, QmlIR::Document *parsedQML, const QQmlRefPointer<QQmlTypeNameCache> &importCache, const QV4::CompiledData::CompilationUnit::ResolvedTypeReferenceMap &resolvedTypeCache)
+    : resolvedTypes(resolvedTypeCache)
+    , engine(engine)
     , typeData(typeData)
+    , importCache(importCache)
     , document(parsedQML)
 {
 }
 
 QV4::CompiledData::CompilationUnit *QQmlTypeCompiler::compile()
 {
-    importCache.adopt(new QQmlTypeNameCache);
-
-    foreach (const QString &ns, typeData->namespaces())
-        importCache->add(ns);
-
-    // Add any Composite Singletons that were used to the import cache
-    foreach (const QQmlTypeData::TypeReference &singleton, typeData->compositeSingletons())
-        importCache->add(singleton.type->qmlTypeName(), singleton.type->sourceUrl(), singleton.prefix);
-
-    typeData->imports().populateCache(importCache.data());
-
-    const QHash<int, QQmlTypeData::TypeReference> &resolvedTypeRefs = typeData->resolvedTypeRefs();
-    for (QHash<int, QQmlTypeData::TypeReference>::ConstIterator resolvedType = resolvedTypeRefs.constBegin(), end = resolvedTypeRefs.constEnd();
-         resolvedType != end; ++resolvedType) {
-        QScopedPointer<QV4::CompiledData::CompilationUnit::ResolvedTypeReference> ref(new QV4::CompiledData::CompilationUnit::ResolvedTypeReference);
-        QQmlType *qmlType = resolvedType->type;
-        if (resolvedType->typeData) {
-            if (resolvedType->needsCreation && qmlType->isCompositeSingleton()) {
-                recordError(resolvedType->location, tr("Composite Singleton Type %1 is not creatable.").arg(qmlType->qmlTypeName()));
-                return nullptr;
-            }
-            ref->compilationUnit = resolvedType->typeData->compilationUnit();
-        } else if (qmlType) {
-            ref->type = qmlType;
-            Q_ASSERT(ref->type);
-
-            if (resolvedType->needsCreation && !ref->type->isCreatable()) {
-                QQmlError error;
-                QString reason = ref->type->noCreationReason();
-                if (reason.isEmpty())
-                    reason = tr("Element is not creatable.");
-                recordError(resolvedType->location, reason);
-                return nullptr;
-            }
-
-            if (ref->type->containsRevisionedAttributes()) {
-                ref->typePropertyCache = engine->cache(ref->type,
-                                                       resolvedType->minorVersion);
-            }
-        }
-        ref->majorVersion = resolvedType->majorVersion;
-        ref->minorVersion = resolvedType->minorVersion;
-        ref->doDynamicTypeCheck();
-        resolvedTypes.insert(resolvedType.key(), ref.take());
-    }
-
     // Build property caches and VME meta object data
 
     for (auto it = resolvedTypes.constBegin(), end = resolvedTypes.constEnd();
diff --git a/src/qml/compiler/qqmltypecompiler_p.h b/src/qml/compiler/qqmltypecompiler_p.h
index b2494212fa..1692e05450 100644
--- a/src/qml/compiler/qqmltypecompiler_p.h
+++ b/src/qml/compiler/qqmltypecompiler_p.h
@@ -89,7 +89,7 @@ struct QQmlTypeCompiler
 {
     Q_DECLARE_TR_FUNCTIONS(QQmlTypeCompiler)
 public:
-    QQmlTypeCompiler(QQmlEnginePrivate *engine, QQmlTypeData *typeData, QmlIR::Document *document);
+    QQmlTypeCompiler(QQmlEnginePrivate *engine, QQmlTypeData *typeData, QmlIR::Document *document, const QQmlRefPointer<QQmlTypeNameCache> &importCache, const QV4::CompiledData::CompilationUnit::ResolvedTypeReferenceMap &resolvedTypeCache);
 
     // --- interface used by QQmlPropertyCacheCreator
     typedef QmlIR::Object CompiledObject;
@@ -98,7 +98,7 @@ public:
     QString stringAt(int idx) const;
     QmlIR::PoolList<QmlIR::Function>::Iterator objectFunctionsBegin(const QmlIR::Object *object) const { return object->functionsBegin(); }
     QmlIR::PoolList<QmlIR::Function>::Iterator objectFunctionsEnd(const QmlIR::Object *object) const { return object->functionsEnd(); }
-    QHash<int, QV4::CompiledData::CompilationUnit::ResolvedTypeReference*> resolvedTypes;
+    QV4::CompiledData::CompilationUnit::ResolvedTypeReferenceMap resolvedTypes;
     // ---
 
     QV4::CompiledData::CompilationUnit *compile();
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index fb82b2bcbb..36103a7b37 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -791,7 +791,8 @@ struct Q_QML_PRIVATE_EXPORT CompilationUnit : public QQmlRefCount
         void doDynamicTypeCheck();
     };
     // map from name index
-    QHash<int, ResolvedTypeReference*> resolvedTypes;
+    typedef QHash<int, ResolvedTypeReference*> ResolvedTypeReferenceMap;
+    ResolvedTypeReferenceMap resolvedTypes;
 
     int metaTypeId;
     int listMetaTypeId;