Support declared providers in AdvertisedProviderSet.

--
PiperOrigin-RevId: 149165836
MOS_MIGRATED_REVID=149165836

6 files changed, 45 insertions, 23 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
index e2fbee956e..a329a4c78f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
@@ -52,6 +52,7 @@ import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
 import com.google.devtools.build.lib.packages.RuleVisibility;
+import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier;
 import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.rules.SkylarkRuleConfiguredTargetBuilder;
 import com.google.devtools.build.lib.rules.fileset.FilesetProvider;
@@ -383,16 +384,16 @@ public final class ConfiguredTargetFactory {
       }
     }
 
-    for (String providerName : advertisedProviders.getSkylarkProviders()) {
+    for (SkylarkProviderIdentifier providerId : advertisedProviders.getSkylarkProviders()) {
       SkylarkProviders skylarkProviders = configuredAspect.getProvider(SkylarkProviders.class);
-      if (skylarkProviders == null || skylarkProviders.getValue(providerName) == null) {
+      if (skylarkProviders == null || skylarkProviders.get(providerId) == null) {
         eventHandler.handle(Event.error(
             target.getLocation(),
             String.format(
                 "Aspect '%s', applied to '%s', does not provide advertised provider '%s'",
                 configuredAspect.getName(),
                 target.getLabel(),
-                providerName
+                providerId
             )));
       }
     }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/SkylarkProviders.java b/src/main/java/com/google/devtools/build/lib/analysis/SkylarkProviders.java
index a568329754..05c9c347a1 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/SkylarkProviders.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/SkylarkProviders.java
@@ -20,6 +20,7 @@ import com.google.devtools.build.lib.analysis.MergedConfiguredTarget.DuplicateEx
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.packages.ClassObjectConstructor;
 import com.google.devtools.build.lib.packages.SkylarkClassObject;
+import com.google.devtools.build.lib.packages.SkylarkProviderIdentifier;
 import com.google.devtools.build.lib.rules.SkylarkApiProvider;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.SkylarkType;
@@ -88,6 +89,13 @@ public final class SkylarkProviders implements TransitiveInfoProvider {
     return declaredProviders.get(key);
   }
 
+  public Object get(SkylarkProviderIdentifier id) {
+    if (id.isLegacy()) {
+      return getValue(id.getLegacyId());
+    }
+    return getDeclaredProvider(id.getKey());
+  }
+
 
   private static final Function<SkylarkProviders, Map<String, Object>>
       SKYLARK_PROVIDERS_MAP_FUNCTION = new Function<SkylarkProviders, Map<String, Object>>() {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AdvertisedProviderSet.java b/src/main/java/com/google/devtools/build/lib/packages/AdvertisedProviderSet.java
index 59c25830bd..1f1ddd6d85 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AdvertisedProviderSet.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AdvertisedProviderSet.java
@@ -38,12 +38,11 @@ import java.util.Objects;
 public final class AdvertisedProviderSet {
   private final boolean canHaveAnyProvider;
   private final ImmutableSet<Class<?>> nativeProviders;
-  // todo(dslomov,vladmos): support declared providers
-  private final ImmutableSet<String> skylarkProviders;
+  private final ImmutableSet<SkylarkProviderIdentifier> skylarkProviders;
 
   private AdvertisedProviderSet(boolean canHaveAnyProvider,
       ImmutableSet<Class<?>> nativeProviders,
-      ImmutableSet<String> skylarkProviders) {
+      ImmutableSet<SkylarkProviderIdentifier> skylarkProviders) {
     this.canHaveAnyProvider = canHaveAnyProvider;
     this.nativeProviders = nativeProviders;
     this.skylarkProviders = skylarkProviders;
@@ -52,15 +51,15 @@ public final class AdvertisedProviderSet {
   public static final AdvertisedProviderSet ANY =
       new AdvertisedProviderSet(true,
           ImmutableSet.<Class<?>>of(),
-          ImmutableSet.<String>of());
+          ImmutableSet.<SkylarkProviderIdentifier>of());
   public static final AdvertisedProviderSet EMPTY =
       new AdvertisedProviderSet(false,
           ImmutableSet.<Class<?>>of(),
-          ImmutableSet.<String>of());
+          ImmutableSet.<SkylarkProviderIdentifier>of());
 
   public static AdvertisedProviderSet create(
       ImmutableSet<Class<?>> nativeProviders,
-      ImmutableSet<String> skylarkProviders) {
+      ImmutableSet<SkylarkProviderIdentifier> skylarkProviders) {
     if (nativeProviders.isEmpty() && skylarkProviders.isEmpty()) {
       return EMPTY;
     }
@@ -106,7 +105,7 @@ public final class AdvertisedProviderSet {
   /**
    * Get all advertised Skylark providers.
    */
-  public ImmutableSet<String> getSkylarkProviders() {
+  public ImmutableSet<SkylarkProviderIdentifier> getSkylarkProviders() {
     return skylarkProviders;
   }
 
@@ -118,7 +117,7 @@ public final class AdvertisedProviderSet {
   public static class Builder {
     private boolean canHaveAnyProvider;
     private final ArrayList<Class<?>> nativeProviders;
-    private final ArrayList<String> skylarkProviders;
+    private final ArrayList<SkylarkProviderIdentifier> skylarkProviders;
     private Builder() {
       nativeProviders = new ArrayList<>();
       skylarkProviders = new ArrayList<>();
@@ -156,7 +155,17 @@ public final class AdvertisedProviderSet {
     }
 
     public Builder addSkylark(String providerName) {
-      skylarkProviders.add(providerName);
+      skylarkProviders.add(SkylarkProviderIdentifier.forLegacy(providerName));
+      return this;
+    }
+
+    public Builder addSkylark(SkylarkProviderIdentifier id) {
+      skylarkProviders.add(id);
+      return this;
+    }
+
+    public Builder addSkylark(ClassObjectConstructor.Key id) {
+      skylarkProviders.add(SkylarkProviderIdentifier.forKey(id));
       return this;
     }
   }
diff --git a/src/main/java/com/google/devtools/build/lib/packages/NativeClassObjectConstructor.java b/src/main/java/com/google/devtools/build/lib/packages/NativeClassObjectConstructor.java
index 011bf3bcfe..b3fd87e73f 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/NativeClassObjectConstructor.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/NativeClassObjectConstructor.java
@@ -18,6 +18,7 @@ import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.FunctionSignature;
 import com.google.devtools.build.lib.syntax.SkylarkType;
+import com.google.devtools.build.lib.util.Pair;
 import java.util.Map;
 import javax.annotation.Nullable;
 
@@ -134,6 +135,17 @@ public abstract class NativeClassObjectConstructor extends ClassObjectConstructo
         String.format("'%s' cannot be constructed from Skylark", getPrintableName()));
   }
 
+  public static Pair<String, String> getSerializedRepresentationForNativeKey(NativeKey key) {
+    return Pair.of(key.name, key.aClass.getName());
+  }
+
+  public static NativeKey getNativeKeyFromSerializedRepresentation(Pair<String, String> serialized)
+      throws ClassNotFoundException {
+    Class<? extends NativeClassObjectConstructor> aClass =
+        Class.forName(serialized.second).asSubclass(NativeClassObjectConstructor.class);
+    return new NativeKey(serialized.first, aClass);
+  }
+
   /**
    * A serializable representation of {@link NativeClassObjectConstructor}.
    *
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RequiredProviders.java b/src/main/java/com/google/devtools/build/lib/packages/RequiredProviders.java
index 371006b6b3..24719c6bf2 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RequiredProviders.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RequiredProviders.java
@@ -14,6 +14,7 @@
 package com.google.devtools.build.lib.packages;
 
 import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
@@ -120,16 +121,7 @@ public final class RequiredProviders {
               return advertisedProviderSet.getNativeProviders().contains(aClass);
             }
           },
-          new Predicate<SkylarkProviderIdentifier>() {
-            @Override
-            public boolean apply(SkylarkProviderIdentifier skylarkProviderIdentifier) {
-              if (!skylarkProviderIdentifier.isLegacy()) {
-                return false;
-              }
-              return advertisedProviderSet.getSkylarkProviders()
-                  .contains(skylarkProviderIdentifier.getLegacyId());
-            }
-          },
+          Predicates.in(advertisedProviderSet.getSkylarkProviders()),
           requiredProviders
       );
     }
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkProviderIdentifier.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkProviderIdentifier.java
index 42684f7f34..d9e663c43c 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkProviderIdentifier.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkProviderIdentifier.java
@@ -88,7 +88,7 @@ public final class SkylarkProviderIdentifier {
 
   @Override
   public int hashCode() {
-    return Objects.hash(legacyId, key);
+    return legacyId != null ? legacyId.hashCode() * 2 : key.hashCode();
   }
 
   @Override