We are trying to merge same copies of the aspect, when target is declared in different attributes, to which we have attached aspect.

--
MOS_MIGRATED_REVID=93412457

1 files changed, 5 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
index 731f47985b..04810eef4d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
@@ -275,6 +275,11 @@ final class ConfiguredTargetFunction implements SkyFunction {
 
     for (Dependency dep : deps) {
       SkyKey depKey = TO_KEYS.apply(dep);
+      // If the same target was declared in different attributes of rule, we should not process it
+      // twice.
+      if (result.containsKey(depKey)) {
+        continue;
+      }
       ConfiguredTarget depConfiguredTarget = configuredTargetMap.get(depKey);
       for (Class<? extends ConfiguredAspectFactory> depAspect : dep.getAspects()) {
         if (!aspectMatchesConfiguredTarget(depConfiguredTarget, depAspect)) {