Don't leak resolved types of failed compilations

If the compilation fails QQmlTypeCompiler::compile() returns nullptr. In
that case, there is no ExecutableCompilationUnit to own the resolved
types. Therefore, delete them.

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

2 files changed, 6 insertions, 5 deletions

diff --git a/src/qml/qml/qqmltypecompiler.cpp b/src/qml/qml/qqmltypecompiler.cpp
index 9a6bd73326..bbeaf7be9a 100644
--- a/src/qml/qml/qqmltypecompiler.cpp
+++ b/src/qml/qml/qqmltypecompiler.cpp
@@ -158,6 +158,9 @@ QQmlRefPointer<QV4::ExecutableCompilationUnit> QQmlTypeCompiler::compile()
     QmlIR::QmlUnitGenerator qmlGenerator;
     qmlGenerator.generate(*document, dependencyHasher);
 
+    if (!errors.isEmpty())
+        return nullptr;
+
     QQmlRefPointer<QV4::ExecutableCompilationUnit> compilationUnit
             = QV4::ExecutableCompilationUnit::create(std::move(
                     document->javaScriptCompilationUnit));
@@ -165,11 +168,7 @@ QQmlRefPointer<QV4::ExecutableCompilationUnit> QQmlTypeCompiler::compile()
     compilationUnit->resolvedTypes = *resolvedTypes;
     compilationUnit->propertyCaches = std::move(m_propertyCaches);
     Q_ASSERT(compilationUnit->propertyCaches.count() == static_cast<int>(compilationUnit->objectCount()));
-
-    if (errors.isEmpty())
-        return compilationUnit;
-    else
-        return nullptr;
+    return compilationUnit;
 }
 
 void QQmlTypeCompiler::recordError(const QV4::CompiledData::Location &location, const QString &description)
diff --git a/src/qml/qml/qqmltypedata.cpp b/src/qml/qml/qqmltypedata.cpp
index b9fbf40e96..5e85d7f692 100644
--- a/src/qml/qml/qqmltypedata.cpp
+++ b/src/qml/qml/qqmltypedata.cpp
@@ -614,6 +614,8 @@ void QQmlTypeData::compile(const QQmlRefPointer<QQmlTypeNameCache> &typeNameCach
     QQmlTypeCompiler compiler(enginePrivate, this, m_document.data(), typeNameCache, resolvedTypeCache, dependencyHasher);
     m_compiledData = compiler.compile();
     if (!m_compiledData) {
+        qDeleteAll(*resolvedTypeCache);
+        resolvedTypeCache->clear();
         setError(compiler.compilationErrors());
         return;
     }