diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2016-10-16 17:54:59 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-10-18 13:26:50 +0000 |
commit | 2c2c92d999ae8584840e44785fbece9bf2cfac62 (patch) | |
tree | 6c5239e3b3189be0e48ea3bd62df7b8c8bb126c2 /src/qml/compiler/qqmltypecompiler_p.h | |
parent | 15630c45e7383cf23ff201af5330c36e32014cdd (diff) |
Fix excessive invalidation of QML disk caches
We use an MD5 checksum over the meta-object data to verify that the
types a QML file depends on haven't changed since the cache was
generated. However when the dependent types are QML types, then the
meta-object data contains dynamically generated type names such as
QMLTYPE_1234, which is non-deterministic. To address this, we resort to
the checksum over the meta-object data only for C++ types (if those
change it's likely an incompatible change) and for QML types use the
fact that all the information about the QML declared types comes from
the QML file only, which means we can in that case simply use a checksum
over the QV4::CompiledData memory chunk.
In addition we need to ensure that the generated CompiledData memory chunk
is deterministic by avoiding any uninitialized bytes (memset) and using
a map instead of a hash for the mapping of object index to object id.
Task-number: QTBUG-55926
Change-Id: I27c840b1960ad36b486198e504b70989c22a3972
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/compiler/qqmltypecompiler_p.h')
-rw-r--r-- | src/qml/compiler/qqmltypecompiler_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/compiler/qqmltypecompiler_p.h b/src/qml/compiler/qqmltypecompiler_p.h index 6ad6ad8557..de6abb4ced 100644 --- a/src/qml/compiler/qqmltypecompiler_p.h +++ b/src/qml/compiler/qqmltypecompiler_p.h @@ -285,7 +285,8 @@ protected: // indices of the objects that are actually Component {} QVector<quint32> componentRoots; - QHash<int, int> _idToObjectIndex; + // Deliberate choice of map over hash here to ensure stable generated output. + QMap<int, int> _idToObjectIndex; QVector<int> _objectsWithAliases; QV4::CompiledData::ResolvedTypeReferenceMap *resolvedTypes; |