diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleConfiguredTargetBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleConfiguredTargetBuilder.java index 84f6a5f3594929..94c507787d418c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleConfiguredTargetBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleConfiguredTargetBuilder.java @@ -186,47 +186,41 @@ private static void addOutputGroups(Object value, Location loc, for (String outputGroup : outputGroups.keySet()) { SkylarkValue objects = outputGroups.get(outputGroup); - NestedSet artifacts = convertToOutputGroupValue(loc, outputGroup, objects); - builder.addOutputGroup(outputGroup, artifacts); - } - } - - public static NestedSet convertToOutputGroupValue(Location loc, String outputGroup, - SkylarkValue objects) throws EvalException { - NestedSet artifacts; + NestedSet artifacts; - String typeErrorMessage = - "Output group '%s' is of unexpected type. " - + "Should be list or set of Files, but got '%s' instead."; + String typeErrorMessage = + "Output group '%s' is of unexpected type. " + + "Should be list or set of Files, but got '%s' instead."; - if (objects instanceof SkylarkList) { - NestedSetBuilder nestedSetBuilder = NestedSetBuilder.stableOrder(); - for (Object o : (SkylarkList) objects) { - if (o instanceof Artifact) { - nestedSetBuilder.add((Artifact) o); - } else { - throw new EvalException( - loc, - String.format( - typeErrorMessage, - outputGroup, - "list with an element of " + EvalUtils.getDataTypeNameFromClass(o.getClass()))); + if (objects instanceof SkylarkList) { + NestedSetBuilder nestedSetBuilder = NestedSetBuilder.stableOrder(); + for (Object o : (SkylarkList) objects) { + if (o instanceof Artifact) { + nestedSetBuilder.add((Artifact) o); + } else { + throw new EvalException( + loc, + String.format( + typeErrorMessage, + outputGroup, + "list with an element of " + EvalUtils.getDataTypeNameFromClass(o.getClass()))); + } } + artifacts = nestedSetBuilder.build(); + } else { + artifacts = + SkylarkType.cast( + objects, + SkylarkNestedSet.class, + Artifact.class, + loc, + typeErrorMessage, + outputGroup, + EvalUtils.getDataTypeName(objects, true)) + .getSet(Artifact.class); } - artifacts = nestedSetBuilder.build(); - } else { - artifacts = - SkylarkType.cast( - objects, - SkylarkNestedSet.class, - Artifact.class, - loc, - typeErrorMessage, - outputGroup, - EvalUtils.getDataTypeName(objects, true)) - .getSet(Artifact.class); + builder.addOutputGroup(outputGroup, artifacts); } - return artifacts; } private static ConfiguredTarget addStructFieldsAndBuild( diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java index eb3922ad1a74cb..b5b8087726a843 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java @@ -15,6 +15,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.ConfiguredAspect; import com.google.devtools.build.lib.analysis.ConfiguredAspectFactory; import com.google.devtools.build.lib.analysis.ConfiguredTarget; @@ -24,13 +25,12 @@ import com.google.devtools.build.lib.packages.AspectParameters; import com.google.devtools.build.lib.packages.SkylarkAspect; import com.google.devtools.build.lib.packages.SkylarkClassObject; -import com.google.devtools.build.lib.rules.SkylarkRuleConfiguredTargetBuilder; import com.google.devtools.build.lib.rules.SkylarkRuleContext; -import com.google.devtools.build.lib.skylarkinterface.SkylarkValue; import com.google.devtools.build.lib.syntax.Environment; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.EvalExceptionWithStackTrace; import com.google.devtools.build.lib.syntax.Mutability; +import com.google.devtools.build.lib.syntax.SkylarkNestedSet; import com.google.devtools.build.lib.syntax.SkylarkType; import java.util.Map; @@ -90,9 +90,8 @@ public ConfiguredAspect create( for (String key : struct.getKeys()) { if (key.equals("output_groups")) { addOutputGroups(struct.getValue(key), loc, builder); - } else { - builder.addSkylarkTransitiveInfo(key, struct.getValue(key), loc); } + builder.addSkylarkTransitiveInfo(key, struct.getValue(key), loc); } ConfiguredAspect configuredAspect = builder.build(); SkylarkProviderValidationUtil.checkOrphanArtifacts(ruleContext); @@ -102,20 +101,21 @@ public ConfiguredAspect create( ruleContext.ruleError("\n" + e.print()); return null; } + } } private static void addOutputGroups(Object value, Location loc, ConfiguredAspect.Builder builder) throws EvalException { - Map outputGroups = - SkylarkType.castMap(value, String.class, SkylarkValue.class, "output_groups"); + Map outputGroups = SkylarkType + .castMap(value, String.class, SkylarkNestedSet.class, "output_groups"); for (String outputGroup : outputGroups.keySet()) { - SkylarkValue objects = outputGroups.get(outputGroup); - + SkylarkNestedSet objects = outputGroups.get(outputGroup); builder.addOutputGroup(outputGroup, - SkylarkRuleConfiguredTargetBuilder.convertToOutputGroupValue(loc, outputGroup, objects)); + SkylarkType.cast(objects, SkylarkNestedSet.class, Artifact.class, loc, + "Output group '%s'", outputGroup).getSet(Artifact.class)); } } 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 3e1a5528755b5d..d053f05adf1951 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 @@ -259,6 +259,7 @@ public void testAspectWithOutputGroups() throws Exception { "", "MyAspect = aspect(", " implementation=_impl,", + " attr_aspects=['deps'],", ")"); scratch.file( "test/BUILD", @@ -292,50 +293,6 @@ public String apply(ConfiguredTarget configuredTarget) { assertThat(names).containsExactlyElementsIn(expectedSet); } - @Test - public void testAspectWithOutputGroupsAsList() throws Exception { - scratch.file( - "test/aspect.bzl", - "def _impl(target, ctx):", - " g = target.output_group('_hidden_top_level" + INTERNAL_SUFFIX + "')", - " return struct(output_groups = { 'my_result' : [ f for f in g] })", - "", - "MyAspect = aspect(", - " implementation=_impl,", - ")"); - scratch.file( - "test/BUILD", - "java_library(", - " name = 'xxx',", - " srcs = ['A.java'],", - ")"); - - AnalysisResult analysisResult = - update(ImmutableList.of("test/aspect.bzl%MyAspect"), "//test:xxx"); - assertThat( - transform( - analysisResult.getTargetsToBuild(), - new Function() { - @Nullable - @Override - public String apply(ConfiguredTarget configuredTarget) { - return configuredTarget.getLabel().toString(); - } - })) - .containsExactly("//test:xxx"); - AspectValue aspectValue = analysisResult.getAspects().iterator().next(); - OutputGroupProvider outputGroupProvider = - aspectValue.getConfiguredAspect().getProvider(OutputGroupProvider.class); - assertThat(outputGroupProvider).isNotNull(); - NestedSet names = outputGroupProvider.getOutputGroup("my_result"); - assertThat(names).isNotEmpty(); - NestedSet expectedSet = getConfiguredTarget("//test:xxx") - .getProvider(OutputGroupProvider.class) - .getOutputGroup(OutputGroupProvider.HIDDEN_TOP_LEVEL); - assertThat(names).containsExactlyElementsIn(expectedSet); - } - - @Test public void testAspectsFromSkylarkRules() throws Exception { scratch.file( @@ -642,40 +599,6 @@ public void duplicateOutputGroups() throws Exception { assertContainsEvent("ERROR /workspace/test/BUILD:3:1: Output group duplicate provided twice"); } - @Test - public void duplicateGroupsFormAspects() throws Exception { - scratch.file( - "test/aspect.bzl", - "def _a1_impl(target, ctx):", - " f = ctx.new_file('f.txt')", - " ctx.file_action(f, 'f')", - " return struct(output_groups = { 'a1_group' : set([f]) })", - "", - "a1 = aspect(implementation=_a1_impl, attr_aspects = ['dep'])", - "def _rule_impl(ctx):", - " pass", - "my_rule1 = rule(_rule_impl, attrs = { 'dep' : attr.label(aspects = [a1]) })", - "def _a2_impl(target, ctx):", - " f = ctx.new_file('f.txt')", - " ctx.file_action(f, 'f')", - " return struct(output_groups = { 'a2_group' : set([f]) })", - "", - "a2 = aspect(implementation=_a2_impl, attr_aspects = ['dep'])", - "my_rule2 = rule(_rule_impl, attrs = { 'dep' : attr.label(aspects = [a2]) })" - ); - scratch.file( - "test/BUILD", - "load(':aspect.bzl', 'my_rule1', 'my_rule2')", - "my_rule1(name = 'base')", - "my_rule1(name = 'xxx', dep = ':base')", - "my_rule2(name = 'yyy', dep = ':xxx')" - ); - - // no error. - update("//test:yyy"); - } - - @Test public void duplicateSkylarkProviders() throws Exception { scratch.file(