Required properties: Allow retroactive require specification

It is now possible to mark a property of a parent class as required in
the child by writing required <propertyName>

Change-Id: I9e9d58c7b5c00577b056e905b39744b2fa359ea0
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 27 insertions, 3 deletions

diff --git a/src/qml/common/qv4compileddata_p.h b/src/qml/common/qv4compileddata_p.h
index 42c476763e..a5a1cf8969 100644
--- a/src/qml/common/qv4compileddata_p.h
+++ b/src/qml/common/qv4compileddata_p.h
@@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE
 // Also change the comment behind the number to describe the latest change. This has the added
 // benefit that if another patch changes the version too, it will result in a merge conflict, and
 // not get removed silently.
-#define QV4_DATA_STRUCTURE_VERSION 0x28// support inline components
+#define QV4_DATA_STRUCTURE_VERSION 0x29// support additional required property features
 
 class QIODevice;
 class QQmlTypeNameCache;
@@ -695,6 +695,12 @@ struct Property
 };
 static_assert(sizeof(Property) == 12, "Property structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
+struct RequiredPropertyExtraData {
+    quint32_le nameIndex;
+};
+
+static_assert (sizeof(RequiredPropertyExtraData) == 4, "RequiredPropertyExtraData structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
+
 struct Alias {
     enum Flags : unsigned int {
         IsReadOnly = 0x1,
@@ -765,13 +771,16 @@ struct Object
     Location locationOfIdProperty;
     quint32_le offsetToInlineComponents;
     quint16_le nInlineComponents;
+    quint32_le offsetToRequiredPropertyExtraData;
+    quint16_le nRequiredPropertyExtraData;
 //    Function[]
 //    Property[]
 //    Signal[]
 //    Binding[]
 //    InlineComponent[]
+//    RequiredPropertyExtraData[]
 
-    static int calculateSizeExcludingSignalsAndEnums(int nFunctions, int nProperties, int nAliases, int nEnums, int nSignals, int nBindings, int nNamedObjectsInComponent, int nInlineComponents)
+    static int calculateSizeExcludingSignalsAndEnums(int nFunctions, int nProperties, int nAliases, int nEnums, int nSignals, int nBindings, int nNamedObjectsInComponent, int nInlineComponents, int nRequiredPropertyExtraData)
     {
         return ( sizeof(Object)
                  + nFunctions * sizeof(quint32)
@@ -782,6 +791,7 @@ struct Object
                  + nBindings * sizeof(Binding)
                  + nNamedObjectsInComponent * sizeof(int)
                  + nInlineComponents * sizeof(InlineComponent)
+                 + nRequiredPropertyExtraData * sizeof(RequiredPropertyExtraData)
                  + 0x7
                ) & ~0x7;
     }
@@ -835,6 +845,16 @@ struct Object
         return reinterpret_cast<const InlineComponent*>(reinterpret_cast<const char *>(this) + offsetToInlineComponents);
     }
 
+    const RequiredPropertyExtraData *requiredPropertyExtraDataAt(int idx) const
+    {
+        return requiredPropertyExtraDataTable() + idx;
+    }
+
+    const RequiredPropertyExtraData *requiredPropertyExtraDataTable() const
+    {
+        return reinterpret_cast<const RequiredPropertyExtraData*>(reinterpret_cast<const char *>(this) + offsetToRequiredPropertyExtraData);
+    }
+
     // --- QQmlPropertyCacheCreator interface
     int propertyCount() const { return nProperties; }
     int aliasCount() const { return nAliases; }
@@ -863,10 +883,14 @@ struct Object
     InlineComponentIterator inlineComponentsBegin() const {return InlineComponentIterator(this, 0);}
     InlineComponentIterator inlineComponentsEnd() const {return InlineComponentIterator(this, nInlineComponents);}
 
+    typedef TableIterator<RequiredPropertyExtraData, Object, &Object::requiredPropertyExtraDataAt> RequiredPropertyExtraDataIterator;
+    RequiredPropertyExtraDataIterator requiredPropertyExtraDataBegin() const {return RequiredPropertyExtraDataIterator(this, 0); };
+    RequiredPropertyExtraDataIterator requiredPropertyExtraDataEnd() const {return RequiredPropertyExtraDataIterator(this, nRequiredPropertyExtraData); };
+
     int namedObjectsInComponentCount() const { return nNamedObjectsInComponent; }
     // ---
 };
-static_assert(sizeof(Object) == 76, "Object structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
+static_assert(sizeof(Object) == 84, "Object structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
 struct Import
 {