fix calculation of added/removed artifacts

We kept lists of added and removed artifacts in ProductBuildData. It was
never quite clear when to invalidate those lists, which led to QBS-635.
Instead we let the RuleNode decide which artifacts it considers as
"added or removed for this rule".

Task-number: QBS-635
Change-Id: I390e0ab775c695045c6e91ade3ac7326692cb314
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

1 files changed, 13 insertions, 10 deletions

diff --git a/src/lib/corelib/buildgraph/productbuilddata.cpp b/src/lib/corelib/buildgraph/productbuilddata.cpp
index 5cdf69923..abea2c861 100644
--- a/src/lib/corelib/buildgraph/productbuilddata.cpp
+++ b/src/lib/corelib/buildgraph/productbuilddata.cpp
@@ -78,8 +78,6 @@ void ProductBuildData::load(PersistentPool &pool)
         rescuableArtifactData.insert(filePath, elem);
     }
     loadArtifactSetByFileTag(pool, artifactsByFileTag);
-    loadArtifactSetByFileTag(pool, addedArtifactsByFileTag);
-    loadArtifactSetByFileTag(pool, removedArtifactsByFileTag);
 
     pool.stream() >> count;
     for (int i = 0; i < count; ++i) {
@@ -112,8 +110,6 @@ void ProductBuildData::store(PersistentPool &pool) const
         it.value().store(pool);
     }
     storeArtifactSetByFileTag(pool, artifactsByFileTag);
-    storeArtifactSetByFileTag(pool, addedArtifactsByFileTag);
-    storeArtifactSetByFileTag(pool, removedArtifactsByFileTag);
 
     pool.stream() << artifactsWithChangedInputsPerRule.count();
     for (ArtifactSetByRule::ConstIterator it = artifactsWithChangedInputsPerRule.constBegin();
@@ -129,14 +125,21 @@ void addArtifactToSet(Artifact *artifact, ProductBuildData::ArtifactSetByFileTag
         container[tag] += artifact;
 }
 
+void removeArtifactFromSetByFileTag(Artifact *artifact, const FileTag &fileTag,
+        ProductBuildData::ArtifactSetByFileTag &container)
+{
+    ProductBuildData::ArtifactSetByFileTag::iterator it = container.find(fileTag);
+    if (it == container.end())
+        return;
+    it->remove(artifact);
+    if (it->isEmpty())
+        container.erase(it);
+}
+
 void removeArtifactFromSet(Artifact *artifact, ProductBuildData::ArtifactSetByFileTag &container)
 {
-    foreach (const FileTag &t, artifact->fileTags) {
-        ArtifactSet &s = container[t];
-        s.remove(artifact);
-        if (s.isEmpty())
-            container.remove(t);
-    }
+    foreach (const FileTag &t, artifact->fileTags)
+        removeArtifactFromSetByFileTag(artifact, t, container);
 }
 
 } // namespace Internal