Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/qml/common/qv4compileddata_p.h
	tests/auto/qml/qmlmin/tst_qmlmin.cpp

Change-Id: Ieabc9e0729630de6a8644024d11b765f35199f29

2 files changed, 71 insertions, 1 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index be02a08f82..4de7734ecf 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -64,6 +64,33 @@ using namespace QQmlJS;
         return false; \
     }
 
+void Object::simplifyRequiredProperties() {
+    // if a property of the current object was marked as required
+    // do not store that information in the ExtraData
+    // but rather mark the property as required
+    QSet<int> required;
+    for (auto it = this->requiredPropertyExtraDataBegin(); it != this->requiredPropertyExtraDataEnd(); ++it)
+        required.insert(it->nameIndex);
+    if (required.isEmpty())
+        return;
+    for (auto it = this->propertiesBegin(); it != this->propertiesEnd(); ++it) {
+        auto requiredIt = required.find(it->nameIndex);
+        if (requiredIt != required.end()) {
+            it->isRequired = true;
+            required.erase(requiredIt);
+        }
+    }
+    QmlIR::RequiredPropertyExtraData *prev = nullptr;
+    auto current = this->requiredPropertyExtraDatas->first;
+    while (current) {
+        if (required.contains(current->nameIndex))
+            prev = current;
+        else
+            requiredPropertyExtraDatas->unlink(prev, current);
+        current = current->next;
+    }
+}
+
 bool Parameter::init(QV4::Compiler::JSUnitGenerator *stringGenerator, const QString &parameterName,
                      const QString &typeName)
 {
@@ -162,6 +189,7 @@ void Object::init(QQmlJS::MemoryPool *pool, int typeNameIndex, int idIndex, cons
     functions = pool->New<PoolList<Function> >();
     functionsAndExpressions = pool->New<PoolList<CompiledFunctionOrExpression> >();
     inlineComponents = pool->New<PoolList<InlineComponent>>();
+    requiredPropertyExtraDatas = pool->New<PoolList<RequiredPropertyExtraData>>();
     declarationsOverride = nullptr;
 }
 
@@ -287,6 +315,11 @@ void Object::appendInlineComponent(InlineComponent *ic)
     inlineComponents->append(ic);
 }
 
+void Object::appendRequiredPropertyExtraData(RequiredPropertyExtraData *extraData)
+{
+    requiredPropertyExtraDatas->append(extraData);
+}
+
 QString Object::appendBinding(Binding *b, bool isListBinding)
 {
     const bool bindingToDefaultProperty = (b->propertyNameIndex == quint32(0));
@@ -448,6 +481,10 @@ bool IRBuilder::generateFromQml(const QString &code, const QString &url, Documen
     qSwap(_imports, output->imports);
     qSwap(_pragmas, output->pragmas);
     qSwap(_objects, output->objects);
+
+    for (auto object: output->objects)
+        object->simplifyRequiredProperties();
+
     return errors.isEmpty();
 }
 
@@ -982,6 +1019,14 @@ bool IRBuilder::visit(QQmlJS::AST::UiSourceElement *node)
     return false;
 }
 
+bool IRBuilder::visit(AST::UiRequired *ast)
+{
+    auto extraData = New<RequiredPropertyExtraData>();
+    extraData->nameIndex = registerString(ast->name.toString());
+    _object->appendRequiredPropertyExtraData(extraData);
+    return false;
+}
+
 QString IRBuilder::asString(QQmlJS::AST::UiQualifiedId *node)
 {
     QString s;
@@ -1577,7 +1622,7 @@ void QmlUnitGenerator::generate(Document &output, const QV4::CompiledData::Depen
     uint nextOffset = objectOffset + objectOffsetTableSize;
     for (Object *o : qAsConst(output.objects)) {
         objectOffsets.insert(o, nextOffset);
-        nextOffset += QV4::CompiledData::Object::calculateSizeExcludingSignalsAndEnums(o->functionCount(), o->propertyCount(), o->aliasCount(), o->enumCount(), o->signalCount(), o->bindingCount(), o->namedObjectsInComponent.size(), o->inlineComponentCount());
+        nextOffset += QV4::CompiledData::Object::calculateSizeExcludingSignalsAndEnums(o->functionCount(), o->propertyCount(), o->aliasCount(), o->enumCount(), o->signalCount(), o->bindingCount(), o->namedObjectsInComponent.size(), o->inlineComponentCount(), o->requiredPropertyExtraDataCount());
 
         int signalTableSize = 0;
         for (const Signal *s = o->firstSignal(); s; s = s->next)
@@ -1660,6 +1705,10 @@ void QmlUnitGenerator::generate(Document &output, const QV4::CompiledData::Depen
         objectToWrite->offsetToInlineComponents = nextOffset;
         nextOffset += objectToWrite->nInlineComponents * sizeof (QV4::CompiledData::InlineComponent);
 
+        objectToWrite->nRequiredPropertyExtraData = o->requiredPropertyExtraDataCount();
+        objectToWrite->offsetToRequiredPropertyExtraData = nextOffset;
+        nextOffset += objectToWrite->nRequiredPropertyExtraData * sizeof(QV4::CompiledData::RequiredPropertyExtraData);
+
         quint32_le *functionsTable = reinterpret_cast<quint32_le *>(objectPtr + objectToWrite->offsetToFunctions);
         for (const Function *f = o->firstFunction(); f; f = f->next)
             *functionsTable++ = o->runtimeFunctionIndices.at(f->index);
@@ -1739,6 +1788,14 @@ void QmlUnitGenerator::generate(Document &output, const QV4::CompiledData::Depen
             *icToWrite = *ic;
             inlineComponentPtr += sizeof(QV4::CompiledData::InlineComponent);
         }
+
+        char *requiredPropertyExtraDataPtr = objectPtr + objectToWrite->offsetToRequiredPropertyExtraData;
+        for (auto it = o->requiredPropertyExtraDataBegin(); it != o->requiredPropertyExtraDataEnd(); ++it) {
+            const RequiredPropertyExtraData *extraData = it.ptr;
+            QV4::CompiledData::RequiredPropertyExtraData *extraDataToWrite = reinterpret_cast<QV4::CompiledData::RequiredPropertyExtraData*>(requiredPropertyExtraDataPtr);
+            *extraDataToWrite = *extraData;
+            requiredPropertyExtraDataPtr += sizeof(QV4::CompiledData::RequiredPropertyExtraData);
+        }
     }
 
     if (!output.javaScriptCompilationUnit.data) {
diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h
index ea27e65f86..ae74254a42 100644
--- a/src/qml/compiler/qqmlirbuilder_p.h
+++ b/src/qml/compiler/qqmlirbuilder_p.h
@@ -285,6 +285,11 @@ struct Alias : public QV4::CompiledData::Alias
     Alias *next;
 };
 
+struct RequiredPropertyExtraData : public QV4::CompiledData::RequiredPropertyExtraData
+{
+    RequiredPropertyExtraData *next;
+};
+
 struct Function
 {
     QV4::CompiledData::Location location;
@@ -341,6 +346,9 @@ public:
     int functionCount() const { return functions->count; }
     const InlineComponent *inlineComponent() const { return inlineComponents->first; }
     int inlineComponentCount() const { return inlineComponents->count; }
+    const RequiredPropertyExtraData *requiredPropertyExtraData() const {return requiredPropertyExtraDatas->first; }
+    int requiredPropertyExtraDataCount() const { return requiredPropertyExtraDatas->count; }
+    void simplifyRequiredProperties();
 
     PoolList<Binding>::Iterator bindingsBegin() const { return bindings->begin(); }
     PoolList<Binding>::Iterator bindingsEnd() const { return bindings->end(); }
@@ -356,6 +364,8 @@ public:
     PoolList<Function>::Iterator functionsEnd() const { return functions->end(); }
     PoolList<InlineComponent>::Iterator inlineComponentsBegin() const { return inlineComponents->begin(); }
     PoolList<InlineComponent>::Iterator inlineComponentsEnd() const { return inlineComponents->end(); }
+    PoolList<RequiredPropertyExtraData>::Iterator requiredPropertyExtraDataBegin() const {return requiredPropertyExtraDatas->begin(); }
+    PoolList<RequiredPropertyExtraData>::Iterator requiredPropertyExtraDataEnd() const {return requiredPropertyExtraDatas->end(); }
 
     // If set, then declarations for this object (and init bindings for these) should go into the
     // specified object. Used for declarations inside group properties.
@@ -369,6 +379,7 @@ public:
     QString appendAlias(Alias *prop, const QString &aliasName, bool isDefaultProperty, const QQmlJS::AST::SourceLocation &defaultToken, QQmlJS::AST::SourceLocation *errorLocation);
     void appendFunction(QmlIR::Function *f);
     void appendInlineComponent(InlineComponent *ic);
+    void appendRequiredPropertyExtraData(RequiredPropertyExtraData *extraData);
 
     QString appendBinding(Binding *b, bool isListBinding);
     Binding *findBinding(quint32 nameIndex) const;
@@ -393,6 +404,7 @@ private:
     PoolList<Binding> *bindings;
     PoolList<Function> *functions;
     PoolList<InlineComponent> *inlineComponents;
+    PoolList<RequiredPropertyExtraData> *requiredPropertyExtraDatas;
 };
 
 struct Q_QMLCOMPILER_PRIVATE_EXPORT Pragma
@@ -469,6 +481,7 @@ public:
     bool visit(QQmlJS::AST::UiPublicMember *ast) override;
     bool visit(QQmlJS::AST::UiScriptBinding *ast) override;
     bool visit(QQmlJS::AST::UiSourceElement *ast) override;
+    bool visit(QQmlJS::AST::UiRequired *ast) override;
 
     void throwRecursionDepthError() override
     {