Do not access SkylarkProviders anywhere outside of ConfiguredTarget implementation.

A first step towards applying the same memory optimizations we do for
native provider representation to Skylark providers (declared and
legacy).

RELNOTES: None.
PiperOrigin-RevId: 156111749

7 files changed, 66 insertions, 108 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java
index 3ea05dc474..f92adf919d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationSkylarkTest.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.analysis.config;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-import com.google.devtools.build.lib.analysis.SkylarkProviders;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.syntax.SkylarkDict;
 import org.junit.Test;
@@ -48,8 +47,7 @@ public final class BuildConfigurationSkylarkTest extends BuildViewTestCase {
         ")");
 
     ConfiguredTarget skylarkTarget = getConfiguredTarget("//examples/config_skylark:my_target");
-    SkylarkProviders skylarkProviders = skylarkTarget.getProvider(SkylarkProviders.class);
-    assertThat(skylarkProviders.getValue("test_env", SkylarkDict.class).get("TEST_ENV_VAR"))
+    assertThat(((SkylarkDict) skylarkTarget.get("test_env")).get("TEST_ENV_VAR"))
         .isEqualTo("my_value");
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
index 92f3ec0c47..25e4c370a0 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
@@ -20,7 +20,6 @@ import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
-import com.google.devtools.build.lib.analysis.SkylarkProviders;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
@@ -65,9 +64,7 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
       "    srcs = ['ToBeProcessed.java'])",
       "my_rule(name = 'my', dep = ':to_be_processed')");
     ConfiguredTarget configuredTarget = getConfiguredTarget("//java/test:my");
-    SkylarkProviders provider = configuredTarget.getProvider(SkylarkProviders.class);
-    SkylarkClassObject skylarkClassObject = provider
-      .getDeclaredProvider(
+    SkylarkClassObject skylarkClassObject = configuredTarget.get(
           new SkylarkKey(Label.parseAbsolute("//java/test:extension.bzl"), "result"));
 
     assertThat(
@@ -126,9 +123,8 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     ConfiguredTarget javaLibraryTarget = getConfiguredTarget("//java/test:jl");
 
     // Extract out the information from skylark rule
-    SkylarkProviders provider = myConfiguredTarget.getProvider(SkylarkProviders.class);
     SkylarkClassObject skylarkClassObject =
-        provider.getDeclaredProvider(
+        myConfiguredTarget.get(
             new SkylarkKey(Label.parseAbsolute("//java/test:extension.bzl"), "result"));
 
     SkylarkNestedSet rawMyCompileJars =
@@ -289,7 +285,7 @@ public class JavaSkylarkApiTest extends BuildViewTestCase {
     SkylarkKey myProviderKey =
         new SkylarkKey(Label.parseAbsolute("//foo:extension.bzl"), "my_provider");
     SkylarkClassObject declaredProvider =
-        myRuleTarget.getProvider(SkylarkProviders.class).getDeclaredProvider(myProviderKey);
+        myRuleTarget.get(myProviderKey);
     Object javaProvider = declaredProvider.getValue("p");
     assertThat(javaProvider).isInstanceOf(JavaProvider.class);
     assertThat(javaLibraryTarget.getProvider(JavaProvider.class)).isEqualTo(javaProvider);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
index c44aea35cb..56b75357ab 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java
@@ -30,7 +30,6 @@ import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.ExtraActionArtifactsProvider;
-import com.google.devtools.build.lib.analysis.SkylarkProviders;
 import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
@@ -588,9 +587,8 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase {
 
   private static <P extends TransitiveInfoProvider> P getProvider(
       Class<P> providerClass, ConfiguredTarget target) {
-    SkylarkProviders skylarkProviders = target.getProvider(SkylarkProviders.class);
     JavaProvider javaProvider =
-        (JavaProvider) skylarkProviders.getDeclaredProvider(JavaProvider.JAVA_PROVIDER.getKey());
+        (JavaProvider) target.get(JavaProvider.JAVA_PROVIDER.getKey());
     return javaProvider.getProvider(providerClass);
   }
 }
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
index 6a8d28b7c6..8609c52d1c 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
@@ -27,7 +27,6 @@ import com.google.devtools.build.lib.analysis.BuildView.AnalysisResult;
 import com.google.devtools.build.lib.analysis.ConfiguredAspect;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.OutputGroupProvider;
-import com.google.devtools.build.lib.analysis.SkylarkProviders;
 import com.google.devtools.build.lib.analysis.ViewCreationFailedException;
 import com.google.devtools.build.lib.analysis.util.AnalysisTestCase;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -35,7 +34,6 @@ import com.google.devtools.build.lib.cmdline.TargetParsingException;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.packages.AspectDefinition;
 import com.google.devtools.build.lib.packages.Attribute.ConfigurationTransition;
-import com.google.devtools.build.lib.packages.ClassObjectConstructor.Key;
 import com.google.devtools.build.lib.packages.SkylarkClassObject;
 import com.google.devtools.build.lib.packages.SkylarkClassObjectConstructor.SkylarkKey;
 import com.google.devtools.build.lib.rules.cpp.CppConfiguration;
@@ -45,7 +43,6 @@ import com.google.devtools.build.lib.syntax.SkylarkList;
 import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import java.util.Arrays;
-import java.util.List;
 import javax.annotation.Nullable;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -95,12 +92,16 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
     assertThat(getLabelsToBuild(analysisResult)).containsExactly("//test:xxx");
     assertThat(getAspectDescriptions(analysisResult))
         .containsExactly("//test:aspect.bzl%MyAspect(//test:xxx)");
+    ConfiguredAspect configuredAspect = Iterables.getOnlyElement(analysisResult.getAspects())
+        .getConfiguredAspect();
 
-    List<Key> providers = getDeclaredProviderKeys(analysisResult);
-    assertThat((providers.get(0)))
-        .isEqualTo(new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl"), "foo"));
-    assertThat((providers.get(1)))
-        .isEqualTo(new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl"), "bar"));
+    SkylarkKey fooKey = new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl"), "foo");
+    SkylarkKey barKey = new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl"), "bar");
+
+    assertThat(configuredAspect.get(fooKey).getConstructor().getKey())
+        .isEqualTo(fooKey);
+    assertThat(configuredAspect.get(barKey).getConstructor().getKey())
+        .isEqualTo(barKey);
   }
 
   @Test
@@ -120,11 +121,16 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
     assertThat(getAspectDescriptions(analysisResult))
         .containsExactly("//test:aspect.bzl%MyAspect(//test:xxx)");
 
-    List<Key> providers = getDeclaredProviderKeys(analysisResult);
-    assertThat((providers.get(0)))
-        .isEqualTo(new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl"), "foo"));
-    assertThat((providers.get(1)))
-        .isEqualTo(new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl"), "bar"));
+    ConfiguredAspect configuredAspect = Iterables.getOnlyElement(analysisResult.getAspects())
+        .getConfiguredAspect();
+
+    SkylarkKey fooKey = new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl"), "foo");
+    SkylarkKey barKey = new SkylarkKey(Label.parseAbsolute("//test:aspect.bzl"), "bar");
+
+    assertThat(configuredAspect.get(fooKey).getConstructor().getKey())
+        .isEqualTo(fooKey);
+    assertThat(configuredAspect.get(barKey).getConstructor().getKey())
+        .isEqualTo(barKey);
   }
 
   private Iterable<String> getAspectDescriptions(AnalysisResult analysisResult) {
@@ -142,24 +148,6 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
         });
   }
 
-  private List<Key> getDeclaredProviderKeys(AnalysisResult analysisResult) {
-    return transform(
-            analysisResult.getAspects(),
-            new Function<AspectValue, List<Key>>() {
-              @Nullable
-              @Override
-              public List<Key> apply(AspectValue aspectValue) {
-                return aspectValue
-                    .getConfiguredAspect()
-                    .getProvider(SkylarkProviders.class)
-                    .getDeclaredProviderKeys()
-                    .asList();
-              }
-            })
-        .iterator()
-        .next(); // Assume there's only one aspect
-  }
-
   @Test
   public void aspectCommandLineLabel() throws Exception {
     scratch.file(
@@ -586,9 +574,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
     AnalysisResult analysisResult = update("//test:xxx");
     assertThat(getLabelsToBuild(analysisResult)).containsExactly("//test:xxx");
     ConfiguredTarget target = analysisResult.getTargetsToBuild().iterator().next();
-    SkylarkProviders skylarkProviders = target.getProvider(SkylarkProviders.class);
-    assertThat(skylarkProviders).isNotNull();
-    Object names = skylarkProviders.getValue("rule_deps");
+    Object names = target.get("rule_deps");
     assertThat(names).isInstanceOf(SkylarkNestedSet.class);
     assertThat(
         transform(
@@ -716,8 +702,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
 
     AnalysisResult analysisResult = update("//test:xxx");
     ConfiguredTarget target = analysisResult.getTargetsToBuild().iterator().next();
-    SkylarkProviders skylarkProviders = target.getProvider(SkylarkProviders.class);
-    Object value = skylarkProviders.getValue("data");
+    Object value = target.get("data");
     assertThat(value).isEqualTo("foo");
   }
 
@@ -755,8 +740,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
 
     AnalysisResult analysisResult = update("//test:xxx");
     ConfiguredTarget target = analysisResult.getTargetsToBuild().iterator().next();
-    SkylarkProviders skylarkProviders = target.getProvider(SkylarkProviders.class);
-    Object value = skylarkProviders.getValue("data");
+    Object value = target.get("data");
     assertThat(value).isEqualTo("yyy:zzz");
   }
 
@@ -1610,7 +1594,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
     ConfiguredTarget configuredTarget = result.getTargetsToBuild().iterator().next();
     SkylarkNestedSet ruleInfoValue =
         (SkylarkNestedSet)
-            configuredTarget.getProvider(SkylarkProviders.class).getValue("rule_info");
+            configuredTarget.get("rule_info");
     assertThat(ruleInfoValue.getSet(String.class))
         .containsExactlyElementsIn(Arrays.asList(expectedLabels));
   }
@@ -1689,8 +1673,7 @@ public class SkylarkAspectsTest extends AnalysisTestCase {
     AnalysisResult analysisResult = update(ImmutableList.<String>of(), "//foo:main");
     ConfiguredTarget target = analysisResult.getTargetsToBuild().iterator().next();
     NestedSet<Artifact> aspectFiles =
-        ((SkylarkNestedSet) target.getProvider(SkylarkProviders.class).getValue("aspect_files"))
-            .getSet(Artifact.class);
+        ((SkylarkNestedSet) target.get("aspect_files")).getSet(Artifact.class);
     assertThat(transform(aspectFiles, new Function<Artifact, String>() {
       @Override
       public String apply(Artifact artifact) {
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
index 02abf93947..d5dc696df8 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
@@ -30,7 +30,6 @@ import com.google.devtools.build.lib.analysis.FileProvider;
 import com.google.devtools.build.lib.analysis.OutputGroupProvider;
 import com.google.devtools.build.lib.analysis.RuleConfiguredTarget;
 import com.google.devtools.build.lib.analysis.RunfilesProvider;
-import com.google.devtools.build.lib.analysis.SkylarkProviders;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
@@ -178,10 +177,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase {
         OutputGroupProvider.get(getConfiguredTarget("//test/skylark:lib"))
             .getOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL);
     ConfiguredTarget myTarget = getConfiguredTarget("//test/skylark:my");
-    SkylarkNestedSet result =
-        (SkylarkNestedSet) myTarget
-            .getProvider(SkylarkProviders.class)
-            .getValue("result");
+    SkylarkNestedSet result = (SkylarkNestedSet) myTarget.get("result");
     assertThat(result.getSet(Artifact.class)).containsExactlyElementsIn(hiddenTopLevelArtifacts);
     assertThat(OutputGroupProvider.get(myTarget).getOutputGroup("my_group"))
         .containsExactlyElementsIn(hiddenTopLevelArtifacts);
@@ -206,10 +202,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase {
         OutputGroupProvider.get(getConfiguredTarget("//test/skylark:lib"))
             .getOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL);
     ConfiguredTarget myTarget = getConfiguredTarget("//test/skylark:my");
-    SkylarkNestedSet result =
-        (SkylarkNestedSet) myTarget
-            .getProvider(SkylarkProviders.class)
-            .getValue("result");
+    SkylarkNestedSet result = (SkylarkNestedSet) myTarget.get("result");
     assertThat(result.getSet(Artifact.class)).containsExactlyElementsIn(hiddenTopLevelArtifacts);
     assertThat(OutputGroupProvider.get(myTarget).getOutputGroup("my_group"))
         .containsExactlyElementsIn(hiddenTopLevelArtifacts);
@@ -241,14 +234,13 @@ public class SkylarkIntegrationTest extends BuildViewTestCase {
         OutputGroupProvider.get(getConfiguredTarget("//test/skylark:lib"))
             .getOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL);
     ConfiguredTarget myTarget = getConfiguredTarget("//test/skylark:my");
-    SkylarkProviders skylarkProviders = myTarget.getProvider(SkylarkProviders.class);
-    SkylarkNestedSet result = (SkylarkNestedSet) skylarkProviders.getValue("result");
+    SkylarkNestedSet result = (SkylarkNestedSet) myTarget.get("result");
     assertThat(result.getSet(Artifact.class)).containsExactlyElementsIn(hiddenTopLevelArtifacts);
     assertThat(OutputGroupProvider.get(myTarget).getOutputGroup("my_group"))
         .containsExactlyElementsIn(hiddenTopLevelArtifacts);
-    assertThat(skylarkProviders.getValue("has_key1")).isEqualTo(Boolean.TRUE);
-    assertThat(skylarkProviders.getValue("has_key2")).isEqualTo(Boolean.FALSE);
-    assertThat((SkylarkList) skylarkProviders.getValue("all_keys"))
+    assertThat(myTarget.get("has_key1")).isEqualTo(Boolean.TRUE);
+    assertThat(myTarget.get("has_key2")).isEqualTo(Boolean.FALSE);
+    assertThat((SkylarkList) myTarget.get("all_keys"))
         .containsExactly(
             "_hidden_top_level" + INTERNAL_SUFFIX,
             "compilation_prerequisites" + INTERNAL_SUFFIX,
@@ -276,9 +268,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase {
         OutputGroupProvider.get(getConfiguredTarget("//test/skylark:lib"))
             .getOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL);
     ConfiguredTarget myTarget = getConfiguredTarget("//test/skylark:my");
-    SkylarkProviders skylarkProviders = myTarget
-        .getProvider(SkylarkProviders.class);
-    SkylarkNestedSet result = (SkylarkNestedSet) skylarkProviders.getValue("result");
+    SkylarkNestedSet result = (SkylarkNestedSet) myTarget.get("result");
     assertThat(result.getSet(Artifact.class)).containsExactlyElementsIn(hiddenTopLevelArtifacts);
     assertThat(OutputGroupProvider.get(myTarget).getOutputGroup("my_group"))
         .containsExactlyElementsIn(hiddenTopLevelArtifacts);
@@ -305,7 +295,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase {
             .getOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL);
     ConfiguredTarget myTarget = getConfiguredTarget("//test/skylark:my");
     SkylarkNestedSet result =
-        (SkylarkNestedSet) myTarget.getProvider(SkylarkProviders.class).getValue("result");
+        (SkylarkNestedSet) myTarget.get("result");
     assertThat(result.getSet(Artifact.class)).containsExactlyElementsIn(hiddenTopLevelArtifacts);
     assertThat(OutputGroupProvider.get(myTarget).getOutputGroup("my_group"))
         .containsExactlyElementsIn(hiddenTopLevelArtifacts);
@@ -334,7 +324,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase {
             .getOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL);
     ConfiguredTarget myTarget = getConfiguredTarget("//test/skylark:my");
     SkylarkNestedSet result =
-        (SkylarkNestedSet) myTarget.getProvider(SkylarkProviders.class).getValue("result");
+        (SkylarkNestedSet) myTarget.get("result");
     assertThat(result.getSet(Artifact.class)).containsExactlyElementsIn(hiddenTopLevelArtifacts);
     assertThat(OutputGroupProvider.get(myTarget).getOutputGroup("my_group"))
         .containsExactlyElementsIn(hiddenTopLevelArtifacts);
@@ -1014,9 +1004,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase {
     ClassObjectConstructor.Key key = new SkylarkClassObjectConstructor.SkylarkKey(
         Label.create(configuredTarget.getLabel().getPackageIdentifier(), "extension.bzl"),
         "my_provider");
-    SkylarkProviders skylarkProviders = configuredTarget.getProvider(SkylarkProviders.class);
-    assertThat(skylarkProviders).isNotNull();
-    SkylarkClassObject declaredProvider = skylarkProviders.getDeclaredProvider(key);
+    SkylarkClassObject declaredProvider = configuredTarget.get(key);
     assertThat(declaredProvider).isNotNull();
     assertThat(declaredProvider.getConstructor().getKey()).isEqualTo(key);
     assertThat(declaredProvider.getValue("x")).isEqualTo(1);
@@ -1041,9 +1029,7 @@ public class SkylarkIntegrationTest extends BuildViewTestCase {
     ClassObjectConstructor.Key key = new SkylarkClassObjectConstructor.SkylarkKey(
         Label.create(configuredTarget.getLabel().getPackageIdentifier(), "extension.bzl"),
         "my_provider");
-    SkylarkProviders skylarkProviders = configuredTarget.getProvider(SkylarkProviders.class);
-    assertThat(skylarkProviders).isNotNull();
-    SkylarkClassObject declaredProvider = skylarkProviders.getDeclaredProvider(key);
+    SkylarkClassObject declaredProvider = configuredTarget.get(key);
     assertThat(declaredProvider).isNotNull();
     assertThat(declaredProvider.getConstructor().getKey()).isEqualTo(key);
     assertThat(declaredProvider.getValue("x")).isEqualTo(1);
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
index e872f8f280..442ec03b3f 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java
@@ -28,7 +28,6 @@ import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.ActionsProvider;
 import com.google.devtools.build.lib.analysis.FileConfiguredTarget;
-import com.google.devtools.build.lib.analysis.SkylarkProviders;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -435,8 +434,7 @@ public class SkylarkRuleContextTest extends SkylarkTestCase {
     TransitiveInfoCollection tic1 = (TransitiveInfoCollection) ((SkylarkList) result).get(0);
     assertNotNull(JavaProvider.getProvider(JavaSourceJarsProvider.class, tic1));
     // Check an unimplemented provider too
-    assertNull(tic1.getProvider(SkylarkProviders.class)
-        .getValue(PyCommon.PYTHON_SKYLARK_PROVIDER_NAME));
+    assertNull(tic1.get(PyCommon.PYTHON_SKYLARK_PROVIDER_NAME));
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
index 8c4be30028..138215fb28 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
@@ -33,7 +33,6 @@ import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.DefaultProvider;
 import com.google.devtools.build.lib.analysis.FilesToRunProvider;
 import com.google.devtools.build.lib.analysis.Runfiles;
-import com.google.devtools.build.lib.analysis.SkylarkProviders;
 import com.google.devtools.build.lib.analysis.actions.FileWriteAction;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
 import com.google.devtools.build.lib.analysis.actions.TemplateExpansionAction;
@@ -888,37 +887,37 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase {
         "foo_rule(name = 'dep_rule', runs = ['run.file', 'run2.file'])",
         "bar_rule(name = 'my_rule', deps = [':dep_rule', 'file.txt'])");
     ConfiguredTarget configuredTarget = getConfiguredTarget("//test:my_rule");
-    SkylarkProviders providers = configuredTarget.getProvider(SkylarkProviders.class);
 
-    assertThat((Boolean) providers.getValue("is_provided")).isTrue();
+    assertThat((Boolean) configuredTarget.get("is_provided")).isTrue();
 
-    Object provider = providers.getValue("provider");
+    Object provider = configuredTarget.get("provider");
     assertThat(provider).isInstanceOf(DefaultProvider.class);
     assertThat(((DefaultProvider) provider).getConstructor().getPrintableName())
         .isEqualTo("DefaultInfo");
 
-    assertThat(providers.getValue("dir"))
+    assertThat(configuredTarget.get("dir"))
         .isEqualTo(
             "[\"data_runfiles\", \"default_runfiles\", \"files\", \"files_to_run\", \"to_json\", "
                 + "\"to_proto\"]");
 
-    assertThat(providers.getValue("rule_data_runfiles")).isInstanceOf(Runfiles.class);
+    assertThat(configuredTarget.get("rule_data_runfiles")).isInstanceOf(Runfiles.class);
     assertThat(
             Iterables.transform(
-                ((Runfiles) providers.getValue("rule_data_runfiles")).getAllArtifacts(), TO_STRING))
+                ((Runfiles) configuredTarget.get("rule_data_runfiles")).getAllArtifacts(),
+                TO_STRING))
         .containsExactly(
             "File:[/workspace[source]]test/run.file", "File:[/workspace[source]]test/run2.file");
 
-    assertThat(providers.getValue("rule_default_runfiles")).isInstanceOf(Runfiles.class);
+    assertThat(configuredTarget.get("rule_default_runfiles")).isInstanceOf(Runfiles.class);
     assertThat(
             Iterables.transform(
-                ((Runfiles) providers.getValue("rule_default_runfiles")).getAllArtifacts(),
+                ((Runfiles) configuredTarget.get("rule_default_runfiles")).getAllArtifacts(),
                 TO_STRING))
         .containsExactly(
             "File:[/workspace[source]]test/run.file", "File:[/workspace[source]]test/run2.file");
 
-    assertThat(providers.getValue("rule_files")).isInstanceOf(SkylarkNestedSet.class);
-    assertThat(providers.getValue("rule_files_to_run")).isInstanceOf(FilesToRunProvider.class);
+    assertThat(configuredTarget.get("rule_files")).isInstanceOf(SkylarkNestedSet.class);
+    assertThat(configuredTarget.get("rule_files_to_run")).isInstanceOf(FilesToRunProvider.class);
   }
 
   @Test
@@ -947,35 +946,35 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase {
         "load(':bar.bzl', 'bar_rule')",
         "bar_rule(name = 'my_rule', deps = ['file.txt'])");
     ConfiguredTarget configuredTarget = getConfiguredTarget("//test:my_rule");
-    SkylarkProviders providers = configuredTarget.getProvider(SkylarkProviders.class);
 
-    assertThat((Boolean) providers.getValue("is_provided")).isTrue();
+    assertThat((Boolean) configuredTarget.get("is_provided")).isTrue();
 
-    Object provider = providers.getValue("provider");
+    Object provider = configuredTarget.get("provider");
     assertThat(provider).isInstanceOf(DefaultProvider.class);
     assertThat(((DefaultProvider) provider).getConstructor().getPrintableName())
         .isEqualTo("DefaultInfo");
 
-    assertThat(providers.getValue("dir"))
+    assertThat(configuredTarget.get("dir"))
         .isEqualTo(
             "[\"data_runfiles\", \"default_runfiles\", \"files\", \"files_to_run\", \"to_json\", "
                 + "\"to_proto\"]");
 
-    assertThat(providers.getValue("file_data_runfiles")).isInstanceOf(Runfiles.class);
+    assertThat(configuredTarget.get("file_data_runfiles")).isInstanceOf(Runfiles.class);
     assertThat(
             Iterables.transform(
-                ((Runfiles) providers.getValue("file_data_runfiles")).getAllArtifacts(), TO_STRING))
+                ((Runfiles) configuredTarget.get("file_data_runfiles")).getAllArtifacts(),
+                TO_STRING))
         .isEmpty();
 
-    assertThat(providers.getValue("file_default_runfiles")).isInstanceOf(Runfiles.class);
+    assertThat(configuredTarget.get("file_default_runfiles")).isInstanceOf(Runfiles.class);
     assertThat(
             Iterables.transform(
-                ((Runfiles) providers.getValue("file_default_runfiles")).getAllArtifacts(),
+                ((Runfiles) configuredTarget.get("file_default_runfiles")).getAllArtifacts(),
                 TO_STRING))
         .isEmpty();
 
-    assertThat(providers.getValue("file_files")).isInstanceOf(SkylarkNestedSet.class);
-    assertThat(providers.getValue("file_files_to_run")).isInstanceOf(FilesToRunProvider.class);
+    assertThat(configuredTarget.get("file_files")).isInstanceOf(SkylarkNestedSet.class);
+    assertThat(configuredTarget.get("file_files_to_run")).isInstanceOf(FilesToRunProvider.class);
   }
 
   @Test
@@ -1013,7 +1012,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase {
         "foo_rule(name = 'dep_rule')",
         "bar_rule(name = 'my_rule', deps = [':dep_rule'])");
     ConfiguredTarget configuredTarget = getConfiguredTarget("//test:my_rule");
-    Object provider = configuredTarget.getProvider(SkylarkProviders.class).getValue("default");
+    Object provider = configuredTarget.get("default");
     assertThat(provider).isInstanceOf(DefaultProvider.class);
     SkylarkClassObject defaultProvider = (DefaultProvider) provider;
     assertThat((defaultProvider).getConstructor().getPrintableName())
@@ -1086,7 +1085,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase {
         "foo_rule(name = 'dep_rule')",
         "bar_rule(name = 'my_rule', deps = [':dep_rule'])");
     ConfiguredTarget configuredTarget = getConfiguredTarget("//test:my_rule");
-    Object provider = configuredTarget.getProvider(SkylarkProviders.class).getValue("proxy");
+    Object provider = configuredTarget.get("proxy");
     assertThat(provider).isInstanceOf(SkylarkClassObject.class);
     assertThat(((SkylarkClassObject) provider).getConstructor().getPrintableName())
         .isEqualTo("foo_provider");
@@ -1132,7 +1131,7 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase {
         "alias(name = 'dep_rule', actual=':foo_rule')",
         "bar_rule(name = 'my_rule', deps = [':dep_rule'])");
     ConfiguredTarget configuredTarget = getConfiguredTarget("//test:my_rule");
-    Object provider = configuredTarget.getProvider(SkylarkProviders.class).getValue("proxy");
+    Object provider = configuredTarget.get("proxy");
     assertThat(provider).isInstanceOf(SkylarkClassObject.class);
     assertThat(((SkylarkClassObject) provider).getConstructor().getPrintableName())
         .isEqualTo("foo_provider");
@@ -1291,10 +1290,10 @@ public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase {
         "outer_rule(name = 'my_rule', deps = [':dep_rule'])");
 
     ConfiguredTarget configuredTarget = getConfiguredTarget("//test:my_rule");
-    Object foo = configuredTarget.getProvider(SkylarkProviders.class).getValue("foo");
+    Object foo = configuredTarget.get("foo");
     assertThat(foo).isInstanceOf(Boolean.class);
     assertThat((Boolean) foo).isTrue();
-    Object bar = configuredTarget.getProvider(SkylarkProviders.class).getValue("bar");
+    Object bar = configuredTarget.get("bar");
     assertThat(bar).isInstanceOf(Boolean.class);
     assertThat((Boolean) bar).isFalse();
   }