Make all WithLegacySkylarkName providers declared providers.

RELNOTES: None
PiperOrigin-RevId: 163042362

1 files changed, 7 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
index 6bf2ee2df3..c4afb4f546 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
@@ -30,6 +30,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.packages.ClassObjectConstructor;
+import com.google.devtools.build.lib.packages.NativeClassObjectConstructor;
 import com.google.devtools.build.lib.packages.SkylarkClassObject;
 import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.packages.TargetUtils;
@@ -212,7 +213,6 @@ public final class RuleConfiguredTargetBuilder {
   public <T extends TransitiveInfoProvider> RuleConfiguredTargetBuilder addProvider(
       TransitiveInfoProvider provider) {
     providersBuilder.add(provider);
-    maybeAddSkylarkProvider(provider);
     return this;
   }
 
@@ -220,9 +220,6 @@ public final class RuleConfiguredTargetBuilder {
   public <T extends TransitiveInfoProvider> RuleConfiguredTargetBuilder addProviders(
       Iterable<TransitiveInfoProvider> providers) {
     providersBuilder.addAll(providers);
-    for (TransitiveInfoProvider provider : providers) {
-      maybeAddSkylarkProvider(provider);
-    }
     return this;
   }
 
@@ -250,14 +247,15 @@ public final class RuleConfiguredTargetBuilder {
     Preconditions.checkNotNull(key);
     Preconditions.checkNotNull(value);
     providersBuilder.put(key, value);
-    maybeAddSkylarkProvider(value);
     return this;
   }
 
-  protected <T extends TransitiveInfoProvider> void maybeAddSkylarkProvider(T value) {
-    if (value instanceof TransitiveInfoProvider.WithLegacySkylarkName) {
+  private <T extends TransitiveInfoProvider> void maybeAddSkylarkLegacyProvider(
+      SkylarkClassObject value) {
+    if (value.getConstructor() instanceof NativeClassObjectConstructor.WithLegacySkylarkName) {
       addSkylarkTransitiveInfo(
-          ((TransitiveInfoProvider.WithLegacySkylarkName) value).getSkylarkName(),
+          ((NativeClassObjectConstructor.WithLegacySkylarkName) value.getConstructor())
+              .getSkylarkName(),
           value);
     }
   }
@@ -328,6 +326,7 @@ public final class RuleConfiguredTargetBuilder {
     ClassObjectConstructor constructor = provider.getConstructor();
     Preconditions.checkState(constructor.isExported());
     providersBuilder.put(provider);
+    maybeAddSkylarkLegacyProvider(provider);
     return this;
   }