Fix invariant in the RequestedArtifacts class

If an artifact map is requested a second time, we need to update the set
of all tags if the artifacts map has changed in the meantime.
This fixes an assertion in the sanity checks.

Change-Id: Iacf8d4376c7a3a356428cc7eb508dbd22e945a8c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/lib/corelib/buildgraph/requestedartifacts.cpp b/src/lib/corelib/buildgraph/requestedartifacts.cpp
index 200f226ce..7fbaf65f1 100644
--- a/src/lib/corelib/buildgraph/requestedartifacts.cpp
+++ b/src/lib/corelib/buildgraph/requestedartifacts.cpp
@@ -73,13 +73,12 @@ bool RequestedArtifacts::isUpToDate(const TopLevelProject *project) const
     return true;
 }
 
-void RequestedArtifacts::setAllArtifactTags(const ResolvedProduct *product)
+void RequestedArtifacts::setAllArtifactTags(const ResolvedProduct *product, bool forceUpdate)
 {
-    if (m_requestedArtifactsPerProduct.find(product->uniqueName())
-            != m_requestedArtifactsPerProduct.cend()) {
-        return;
-    }
     RequestedArtifactsPerProduct &ra = m_requestedArtifactsPerProduct[product->uniqueName()];
+    if (!ra.allTags.empty() && !forceUpdate)
+        return;
+    ra.allTags.clear();
     const ArtifactSetByFileTag artifactsMap = product->buildData->artifactsByFileTag();
     for (auto it = artifactsMap.begin(); it != artifactsMap.end(); ++it)
         ra.allTags.insert(it.key().toString());