Move PropertyResolver out of qqmlirbuilder*

The "early" compilation doesn't use it and we can get rid of a few
V4_BOOTSTRAP checks this way.

Change-Id: I1c4845aba445b105ddace0b6810e0e5c28a25b29
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

9 files changed, 199 insertions, 85 deletions

diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri
index da3c173545..0767c4fedf 100644
--- a/src/qml/compiler/compiler.pri
+++ b/src/qml/compiler/compiler.pri
@@ -28,6 +28,7 @@ SOURCES += \
 !qmldevtools_build {
 
 HEADERS += \
+    $$PWD/qqmlpropertyresolver_p.h \
     $$PWD/qqmltypecompiler_p.h \
     $$PWD/qqmlpropertycachecreator_p.h \
     $$PWD/qqmlpropertyvalidator_p.h \
@@ -35,6 +36,7 @@ HEADERS += \
 
 
 SOURCES += \
+    $$PWD/qqmlpropertyresolver.cpp \
     $$PWD/qqmltypecompiler.cpp \
     $$PWD/qqmlpropertycachecreator.cpp \
     $$PWD/qqmlpropertyvalidator.cpp \
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index 6e077ec44c..04d116ddee 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -1914,53 +1914,6 @@ QVector<int> JSCodeGen::generateJSCodeForFunctionsAndBindings(const QList<Compil
 
 #ifndef V4_BOOTSTRAP
 
-QQmlPropertyData *PropertyResolver::property(const QString &name, bool *notInRevision, RevisionCheck check) const
-{
-    if (notInRevision) *notInRevision = false;
-
-    QQmlPropertyData *d = cache->property(name, nullptr, nullptr);
-
-    // Find the first property
-    while (d && d->isFunction())
-        d = cache->overrideData(d);
-
-    if (check != IgnoreRevision && d && !cache->isAllowedInRevision(d)) {
-        if (notInRevision) *notInRevision = true;
-        return nullptr;
-    } else {
-        return d;
-    }
-}
-
-
-QQmlPropertyData *PropertyResolver::signal(const QString &name, bool *notInRevision) const
-{
-    if (notInRevision) *notInRevision = false;
-
-    QQmlPropertyData *d = cache->property(name, nullptr, nullptr);
-    if (notInRevision) *notInRevision = false;
-
-    while (d && !(d->isFunction()))
-        d = cache->overrideData(d);
-
-    if (d && !cache->isAllowedInRevision(d)) {
-        if (notInRevision) *notInRevision = true;
-        return nullptr;
-    } else if (d && d->isSignal()) {
-        return d;
-    }
-
-    if (name.endsWith(QLatin1String("Changed"))) {
-        QString propName = name.mid(0, name.length() - static_cast<int>(strlen("Changed")));
-
-        d = property(propName, notInRevision);
-        if (d)
-            return cache->signal(d->notifyIndex());
-    }
-
-    return nullptr;
-}
-
 IRLoader::IRLoader(const QV4::CompiledData::Unit *qmlData, QmlIR::Document *output)
     : unit(qmlData)
     , output(output)
diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h
index 298fe7dd92..0b462cf4bb 100644
--- a/src/qml/compiler/qqmlirbuilder_p.h
+++ b/src/qml/compiler/qqmlirbuilder_p.h
@@ -508,32 +508,6 @@ private:
     char *writeBindings(char *bindingPtr, const Object *o, BindingFilter filter) const;
 };
 
-#ifndef V4_BOOTSTRAP
-struct Q_QML_EXPORT PropertyResolver
-{
-    PropertyResolver(const QQmlRefPointer<QQmlPropertyCache> &cache)
-        : cache(cache)
-    {}
-
-    QQmlPropertyData *property(int index) const
-    {
-        return cache->property(index);
-    }
-
-    enum RevisionCheck {
-        CheckRevision,
-        IgnoreRevision
-    };
-
-    QQmlPropertyData *property(const QString &name, bool *notInRevision = nullptr, RevisionCheck check = CheckRevision) const;
-
-    // This code must match the semantics of QQmlPropertyPrivate::findSignalByName
-    QQmlPropertyData *signal(const QString &name, bool *notInRevision) const;
-
-    QQmlRefPointer<QQmlPropertyCache> cache;
-};
-#endif
-
 struct Q_QML_PRIVATE_EXPORT JSCodeGen : public QV4::Compiler::Codegen
 {
     JSCodeGen(const QString &sourceCode, QV4::Compiler::JSUnitGenerator *jsUnitGenerator, QV4::Compiler::Module *jsModule,
diff --git a/src/qml/compiler/qqmlpropertycachecreator.cpp b/src/qml/compiler/qqmlpropertycachecreator.cpp
index fb54da5b73..bd4f2a0612 100644
--- a/src/qml/compiler/qqmlpropertycachecreator.cpp
+++ b/src/qml/compiler/qqmlpropertycachecreator.cpp
@@ -64,7 +64,9 @@ bool QQmlBindingInstantiationContext::resolveInstantiatingProperty()
     Q_ASSERT(instantiatingBinding->propertyNameIndex != 0);
 
     bool notInRevision = false;
-    instantiatingProperty = QmlIR::PropertyResolver(referencingObjectPropertyCache).property(instantiatingPropertyName, &notInRevision, QmlIR::PropertyResolver::IgnoreRevision);
+    instantiatingProperty = QQmlPropertyResolver(referencingObjectPropertyCache)
+                                    .property(instantiatingPropertyName, &notInRevision,
+                                              QQmlPropertyResolver::IgnoreRevision);
     return instantiatingProperty != nullptr;
 }
 
diff --git a/src/qml/compiler/qqmlpropertycachecreator_p.h b/src/qml/compiler/qqmlpropertycachecreator_p.h
index 346cfb5803..28eea27675 100644
--- a/src/qml/compiler/qqmlpropertycachecreator_p.h
+++ b/src/qml/compiler/qqmlpropertycachecreator_p.h
@@ -53,6 +53,7 @@
 #include <private/qqmlvaluetype_p.h>
 #include <private/qqmlengine_p.h>
 #include <private/qqmlmetaobject_p.h>
+#include <private/qqmlpropertyresolver_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -323,7 +324,7 @@ inline QQmlCompileError QQmlPropertyCacheCreator<ObjectContainer>::createMetaObj
 
     int varPropCount = 0;
 
-    QmlIR::PropertyResolver resolver(baseTypeCache);
+    QQmlPropertyResolver resolver(baseTypeCache);
 
     auto p = obj->propertiesBegin();
     auto pend = obj->propertiesEnd();
diff --git a/src/qml/compiler/qqmlpropertyresolver.cpp b/src/qml/compiler/qqmlpropertyresolver.cpp
new file mode 100644
index 0000000000..90eaca0b90
--- /dev/null
+++ b/src/qml/compiler/qqmlpropertyresolver.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qqmlpropertyresolver_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QQmlPropertyData *QQmlPropertyResolver::property(const QString &name, bool *notInRevision,
+                                                 RevisionCheck check) const
+{
+    if (notInRevision) *notInRevision = false;
+
+    QQmlPropertyData *d = cache->property(name, nullptr, nullptr);
+
+    // Find the first property
+    while (d && d->isFunction())
+        d = cache->overrideData(d);
+
+    if (check != IgnoreRevision && d && !cache->isAllowedInRevision(d)) {
+        if (notInRevision) *notInRevision = true;
+        return nullptr;
+    } else {
+        return d;
+    }
+}
+
+
+QQmlPropertyData *QQmlPropertyResolver::signal(const QString &name, bool *notInRevision) const
+{
+    if (notInRevision) *notInRevision = false;
+
+    QQmlPropertyData *d = cache->property(name, nullptr, nullptr);
+    if (notInRevision) *notInRevision = false;
+
+    while (d && !(d->isFunction()))
+        d = cache->overrideData(d);
+
+    if (d && !cache->isAllowedInRevision(d)) {
+        if (notInRevision) *notInRevision = true;
+        return nullptr;
+    } else if (d && d->isSignal()) {
+        return d;
+    }
+
+    if (name.endsWith(QLatin1String("Changed"))) {
+        QString propName = name.mid(0, name.length() - static_cast<int>(strlen("Changed")));
+
+        d = property(propName, notInRevision);
+        if (d)
+            return cache->signal(d->notifyIndex());
+    }
+
+    return nullptr;
+}
+
+QT_END_NAMESPACE
diff --git a/src/qml/compiler/qqmlpropertyresolver_p.h b/src/qml/compiler/qqmlpropertyresolver_p.h
new file mode 100644
index 0000000000..df857f242e
--- /dev/null
+++ b/src/qml/compiler/qqmlpropertyresolver_p.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLPROPERTYRESOLVER_P_H
+#define QQMLPROPERTYRESOLVER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <private/qtqmlglobal_p.h>
+#include <private/qqmlpropertycache_p.h>
+#include <private/qqmlrefcount_p.h>
+
+QT_BEGIN_NAMESPACE
+
+struct Q_QML_EXPORT QQmlPropertyResolver
+{
+    QQmlPropertyResolver(const QQmlRefPointer<QQmlPropertyCache> &cache)
+        : cache(cache)
+    {}
+
+    QQmlPropertyData *property(int index) const
+    {
+        return cache->property(index);
+    }
+
+    enum RevisionCheck {
+        CheckRevision,
+        IgnoreRevision
+    };
+
+    QQmlPropertyData *property(const QString &name, bool *notInRevision = nullptr,
+                               RevisionCheck check = CheckRevision) const;
+
+    // This code must match the semantics of QQmlPropertyPrivate::findSignalByName
+    QQmlPropertyData *signal(const QString &name, bool *notInRevision) const;
+
+    QQmlRefPointer<QQmlPropertyCache> cache;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLPROPERTYRESOLVER_P_H
diff --git a/src/qml/compiler/qqmlpropertyvalidator.cpp b/src/qml/compiler/qqmlpropertyvalidator.cpp
index 8c06760d42..1812ad6546 100644
--- a/src/qml/compiler/qqmlpropertyvalidator.cpp
+++ b/src/qml/compiler/qqmlpropertyvalidator.cpp
@@ -41,6 +41,7 @@
 
 #include <private/qqmlcustomparser_p.h>
 #include <private/qqmlstringconverters_p.h>
+#include <private/qqmlpropertyresolver_p.h>
 #include <QtCore/qdatetime.h>
 
 QT_BEGIN_NAMESPACE
@@ -121,7 +122,7 @@ QVector<QQmlCompileError> QQmlPropertyValidator::validateObject(int objectIndex,
         groupProperties.insert(pos, binding);
     }
 
-    QmlIR::PropertyResolver propertyResolver(propertyCache);
+    QQmlPropertyResolver propertyResolver(propertyCache);
 
     QString defaultPropertyName;
     QQmlPropertyData *defaultProperty = nullptr;
@@ -164,7 +165,7 @@ QVector<QQmlCompileError> QQmlPropertyValidator::validateObject(int objectIndex,
                 pd = propertyResolver.signal(name, &notInRevision);
             } else {
                 pd = propertyResolver.property(name, &notInRevision,
-                                               QmlIR::PropertyResolver::CheckRevision);
+                                               QQmlPropertyResolver::CheckRevision);
             }
 
             if (notInRevision) {
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp
index 239f04a58f..db57d38c24 100644
--- a/src/qml/compiler/qqmltypecompiler.cpp
+++ b/src/qml/compiler/qqmltypecompiler.cpp
@@ -44,6 +44,7 @@
 #include <private/qqmlcustomparser_p.h>
 #include <private/qqmlvmemetaobject_p.h>
 #include <private/qqmlcomponent_p.h>
+#include <private/qqmlpropertyresolver_p.h>
 
 #define COMPILE_EXCEPTION(token, desc) \
     { \
@@ -357,7 +358,7 @@ bool SignalHandlerConverter::convertSignalHandlerExpressionsToFunctionDeclaratio
         if (!QmlIR::IRBuilder::isSignalPropertyName(propertyName))
             continue;
 
-        QmlIR::PropertyResolver resolver(propertyCache);
+        QQmlPropertyResolver resolver(propertyCache);
 
         Q_ASSERT(propertyName.startsWith(QLatin1String("on")));
         propertyName.remove(0, 2);
@@ -513,7 +514,7 @@ bool QQmlEnumTypeResolver::resolveEnumBindings()
             continue;
         const QmlIR::Object *obj = qmlObjects.at(i);
 
-        QmlIR::PropertyResolver resolver(propertyCache);
+        QQmlPropertyResolver resolver(propertyCache);
 
         for (QmlIR::Binding *binding = obj->firstBinding(); binding; binding = binding->next) {
             if (binding->flags & QV4::CompiledData::Binding::IsSignalHandlerExpression
@@ -722,7 +723,7 @@ void QQmlAliasAnnotator::annotateBindingsToAliases()
 
         const QmlIR::Object *obj = qmlObjects.at(i);
 
-        QmlIR::PropertyResolver resolver(propertyCache);
+        QQmlPropertyResolver resolver(propertyCache);
         QQmlPropertyData *defaultProperty = obj->indexOfDefaultPropertyOrAlias != -1 ? propertyCache->parent()->defaultProperty() : propertyCache->defaultProperty();
 
         for (QmlIR::Binding *binding = obj->firstBinding(); binding; binding = binding->next) {
@@ -754,7 +755,7 @@ void QQmlScriptStringScanner::scan()
 
         const QmlIR::Object *obj = qmlObjects.at(i);
 
-        QmlIR::PropertyResolver resolver(propertyCache);
+        QQmlPropertyResolver resolver(propertyCache);
         QQmlPropertyData *defaultProperty = obj->indexOfDefaultPropertyOrAlias != -1 ? propertyCache->parent()->defaultProperty() : propertyCache->defaultProperty();
 
         for (QmlIR::Binding *binding = obj->firstBinding(); binding; binding = binding->next) {
@@ -799,7 +800,7 @@ static bool isUsableComponent(const QMetaObject *metaObject)
 
 void QQmlComponentAndAliasResolver::findAndRegisterImplicitComponents(const QmlIR::Object *obj, QQmlPropertyCache *propertyCache)
 {
-    QmlIR::PropertyResolver propertyResolver(propertyCache);
+    QQmlPropertyResolver propertyResolver(propertyCache);
 
     QQmlPropertyData *defaultProperty = obj->indexOfDefaultPropertyOrAlias != -1 ? propertyCache->parent()->defaultProperty() : propertyCache->defaultProperty();
 
@@ -1110,7 +1111,7 @@ QQmlComponentAndAliasResolver::AliasResolutionResult QQmlComponentAndAliasResolv
                 break;
             }
 
-            QmlIR::PropertyResolver resolver(targetCache);
+            QQmlPropertyResolver resolver(targetCache);
 
             QQmlPropertyData *targetProperty = resolver.property(property.toString());
 
@@ -1224,7 +1225,7 @@ bool QQmlDeferredAndCustomParserBindingScanner::scanObject(int objectIndex)
 
     QQmlCustomParser *customParser = customParsers.value(obj->inheritedTypeNameIndex);
 
-    QmlIR::PropertyResolver propertyResolver(propertyCache);
+    QQmlPropertyResolver propertyResolver(propertyCache);
 
     QStringList deferredPropertyNames;
     {
@@ -1263,7 +1264,8 @@ bool QQmlDeferredAndCustomParserBindingScanner::scanObject(int objectIndex)
                 continue;
 
             bool notInRevision = false;
-            pd = propertyResolver.property(name, &notInRevision, QmlIR::PropertyResolver::CheckRevision);
+            pd = propertyResolver.property(name, &notInRevision,
+                                           QQmlPropertyResolver::CheckRevision);
         }
 
         bool seenSubObjectWithId = false;