diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java index 8b572a03c5c..536cb1019c5 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java @@ -535,7 +535,7 @@ public static Object resolveLateBoundDefault( Attribute attribute, BuildConfiguration ruleConfig, BuildConfiguration hostConfig) { - Preconditions.checkState(!attribute.getTransitionFactory().isSplit()); + Preconditions.checkState(!attribute.hasSplitConfigurationTransition()); @SuppressWarnings("unchecked") LateBoundDefault lateBoundDefault = (LateBoundDefault) attribute.getLateBoundDefault(); diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java index 6b8b434c0b0..a669df3fc0d 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java @@ -813,7 +813,7 @@ public Map getPrerequisiteMap(String attribute public List getPrerequisiteConfiguredTargetAndTargets( String attributeName, Mode mode) { Attribute attributeDefinition = attributes().getAttributeDefinition(attributeName); - if ((mode == Mode.TARGET) && (attributeDefinition.getTransitionFactory().isSplit())) { + if ((mode == Mode.TARGET) && (attributeDefinition.hasSplitConfigurationTransition())) { // TODO(bazel-team): If you request a split-configured attribute in the target configuration, // we return only the list of configured targets for the first architecture; this is for // backwards compatibility with existing code in cases where the call to getPrerequisites is @@ -837,7 +837,7 @@ public List getPrerequisiteConfiguredTargetAndTargets( getSplitPrerequisiteConfiguredTargetAndTargets(String attributeName) { checkAttribute(attributeName, Mode.SPLIT); Attribute attributeDefinition = attributes().getAttributeDefinition(attributeName); - Preconditions.checkState(attributeDefinition.getTransitionFactory().isSplit()); + Preconditions.checkState(attributeDefinition.hasSplitConfigurationTransition()); SplitTransition transition = (SplitTransition) attributeDefinition @@ -1192,7 +1192,7 @@ private void checkAttribute(String attributeName, Mode mode) { + getRuleClassNameForLogging() + " attribute " + attributeName + ": DATA transition no longer supported"); // See b/80157700. } else if (mode == Mode.SPLIT) { - if (!(attributeDefinition.getTransitionFactory().isSplit())) { + if (!(attributeDefinition.hasSplitConfigurationTransition())) { throw new IllegalStateException(getRule().getLocation() + ": " + getRuleClassNameForLogging() + " attribute " + attributeName + " is not configured for a split transition"); diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributeTransitionProvider.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributeTransitionProvider.java index d6eb362de0e..eb3d662143d 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributeTransitionProvider.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributeTransitionProvider.java @@ -33,8 +33,10 @@ import com.google.devtools.build.lib.packages.StructProvider; import com.google.devtools.build.lib.skylarkbuildapi.SplitTransitionProviderApi; import com.google.devtools.build.lib.skylarkinterface.SkylarkPrinter; +import com.google.devtools.build.lib.syntax.Environment; import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Starlark; +import com.google.devtools.build.lib.syntax.Runtime; +import com.google.devtools.build.lib.syntax.SkylarkType; import java.util.LinkedHashMap; import java.util.List; @@ -92,7 +94,9 @@ class FunctionSplitTransition extends StarlarkTransition implements SplitTransit LinkedHashMap attributes = new LinkedHashMap<>(); for (String attribute : attributeMap.getAttributeNames()) { Object val = attributeMap.get(attribute, attributeMap.getAttributeType(attribute)); - attributes.put(Attribute.getSkylarkName(attribute), Starlark.fromJava(val, null)); + attributes.put( + Attribute.getSkylarkName(attribute), + val == null ? Runtime.NONE : SkylarkType.convertToSkylark(val, (Environment) null)); } attrObject = StructProvider.STRUCT.create(attributes, ERROR_MESSAGE_FOR_NO_ATTR); } diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/packages/Attribute.java index 1d5a0b1b71a..a1c80d8928c 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/packages/Attribute.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/packages/Attribute.java @@ -2149,6 +2149,14 @@ public TransitionFactory getTransitionFactory() { return transitionFactory; } + /** + * Returns true if this attribute transitions on a split transition. See {@link SplitTransition}. + */ + // TODO(https://github.com/bazelbuild/bazel/issues/7814) Remove this. + public boolean hasSplitConfigurationTransition() { + return transitionFactory.isSplit(); + } + /** * Returns true if this attribute transitions to the host configuration. See {@link * com.google.devtools.build.lib.analysis.config.HostTransition}. diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java index c911f4a34a5..7d609c836c1 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java @@ -1027,7 +1027,7 @@ static FlagGroup flagGroupFromSkylark(SkylarkInfo flagGroupStruct) throws EvalEx ImmutableList flags = getStringListFromSkylarkProviderField(flagGroupStruct, "flags"); for (String flag : flags) { StringValueParser parser = new StringValueParser(flag); - expandableBuilder.add(Flag.create(parser.getChunks())); + expandableBuilder.add(new Flag(parser.getChunks())); } ImmutableList flagGroups = diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/LibraryToLink.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/LibraryToLink.java index 9b868a873d3..f0cac214a92 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/LibraryToLink.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/LibraryToLink.java @@ -31,7 +31,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcLinkingContextApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.LibraryToLinkApi; -import com.google.devtools.build.lib.syntax.Environment; import com.google.devtools.build.lib.syntax.SkylarkList; import com.google.devtools.build.lib.syntax.SkylarkNestedSet; import com.google.devtools.build.lib.util.Fingerprint; @@ -62,7 +61,7 @@ public Artifact getDynamicLibraryForRuntimeOrNull(boolean linkingStatically) { } /** Structure of CcLinkingContext. */ - public static class CcLinkingContext implements CcLinkingContextApi { + public static class CcLinkingContext implements CcLinkingContextApi { public static final CcLinkingContext EMPTY = builder().build(); /** A list of link options contributed by a single configured target/aspect. */ @@ -290,12 +289,8 @@ public SkylarkList getSkylarkUserLinkFlags() { } @Override - public Object getSkylarkLibrariesToLink(Environment environment) { - if (environment.getSemantics().incompatibleDepsetForLibrariesToLinkGetter()) { - return SkylarkNestedSet.of(LibraryToLink.class, libraries); - } else { - return SkylarkList.createImmutable(libraries.toList()); - } + public SkylarkList getSkylarkLibrariesToLink() { + return SkylarkList.createImmutable(libraries.toList()); } @Override @@ -448,7 +443,6 @@ public String toString() { public abstract Artifact getDynamicLibrary(); @Nullable - @Override public abstract Artifact getResolvedSymlinkDynamicLibrary(); @Nullable @@ -456,7 +450,6 @@ public String toString() { public abstract Artifact getInterfaceLibrary(); @Nullable - @Override public abstract Artifact getResolvedSymlinkInterfaceLibrary(); @Override diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/BazelCcModuleApi.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/BazelCcModuleApi.java index 7e72e20e786..b01da22d2cb 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/BazelCcModuleApi.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/BazelCcModuleApi.java @@ -14,18 +14,18 @@ package com.google.devtools.build.lib.skylarkbuildapi.cpp; -import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.SkylarkActionFactoryApi; import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; import com.google.devtools.build.lib.skylarkinterface.Param; +import com.google.devtools.build.lib.skylarkinterface.ParamType; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; -import com.google.devtools.build.lib.skylarkinterface.StarlarkContext; -import com.google.devtools.build.lib.syntax.Environment; import com.google.devtools.build.lib.syntax.EvalException; +import com.google.devtools.build.lib.syntax.Runtime.NoneType; import com.google.devtools.build.lib.syntax.SkylarkList; import com.google.devtools.build.lib.syntax.SkylarkList.Tuple; +import com.google.devtools.build.lib.syntax.SkylarkNestedSet; /** Utilites related to C++ support. */ @SkylarkModule( @@ -40,12 +40,11 @@ public interface BazelCcModuleApi< CompilationContextT extends CcCompilationContextApi, CompilationOutputsT extends CcCompilationOutputsApi, LinkingOutputsT extends CcLinkingOutputsApi, - LibraryToLinkT extends LibraryToLinkApi, - LinkingContextT extends CcLinkingContextApi, + LinkingContextT extends CcLinkingContextApi, + LibraryToLinkT extends LibraryToLinkApi, CcToolchainVariablesT extends CcToolchainVariablesApi, CcToolchainConfigInfoT extends CcToolchainConfigInfoApi> extends CcModuleApi< - SkylarkActionFactoryT, FileT, CcToolchainProviderT, FeatureConfigurationT, @@ -54,14 +53,11 @@ public interface BazelCcModuleApi< LibraryToLinkT, CcToolchainVariablesT, SkylarkRuleContextT, - CcToolchainConfigInfoT, - CompilationOutputsT> { + CcToolchainConfigInfoT> { @SkylarkCallable( name = "compile", - doc = "Should be used for C++ compilation.", - useEnvironment = true, - useLocation = true, + documented = false, parameters = { @Param( name = "actions", @@ -140,13 +136,6 @@ public interface BazelCcModuleApi< noneable = true, defaultValue = "[]", type = SkylarkList.class), - @Param( - name = "defines", - doc = "Set of defines needed to compile this target. Each define is a string.", - positional = false, - named = true, - defaultValue = "[]", - type = SkylarkList.class), @Param( name = "user_compile_flags", doc = "Additional list of compilation options.", @@ -195,22 +184,16 @@ Tuple compile( SkylarkList includes, SkylarkList quoteIncludes, SkylarkList systemIncludes, - SkylarkList defines, SkylarkList userCompileFlags, SkylarkList ccCompilationContexts, String name, boolean disallowPicOutputs, - boolean disallowNopicOutputs, - Location location, - Environment environment) + boolean disallowNopicOutputs) throws EvalException, InterruptedException; @SkylarkCallable( name = "link", - doc = "Should be used for C++ transitive linking.", - useEnvironment = true, - useLocation = true, - useContext = true, + documented = false, parameters = { @Param( name = "actions", @@ -237,7 +220,11 @@ Tuple compile( named = true, defaultValue = "None", noneable = true, - type = CcCompilationOutputsApi.class), + allowedTypes = { + @ParamType(type = NoneType.class), + @ParamType(type = SkylarkList.class), + @ParamType(type = SkylarkNestedSet.class) + }), @Param( name = "user_link_flags", doc = "Additional list of linker options.", @@ -249,8 +236,8 @@ Tuple compile( @Param( name = "linking_contexts", doc = - "Linking contexts from dependencies to be linked into the linking context " - + "generated by this rule.", + "Libraries from dependencies. These libraries will be linked into the output " + + "artifact of the link() call, be it a binary or a library.", positional = false, named = true, noneable = true, @@ -266,15 +253,15 @@ Tuple compile( type = String.class), @Param( name = "language", - doc = "Can be one of c++, objc or objc++.", + doc = "Can be one of C++, objc or objc++.", positional = false, named = true, noneable = true, - defaultValue = "'c++'", + defaultValue = "'C++'", type = String.class), @Param( name = "output_type", - doc = "Can be either 'executable' or 'dynamic_library'.", + doc = "Can be either 'executable' or 'shared_library'.", positional = false, named = true, noneable = true, @@ -289,7 +276,7 @@ Tuple compile( defaultValue = "True", type = Boolean.class), @Param( - name = "additional_inputs", + name = "non_code_inputs", doc = "For additional inputs to the linking action, e.g.: linking scripts.", positional = false, named = true, @@ -300,28 +287,19 @@ LinkingOutputsT link( SkylarkActionFactoryT skylarkActionFactoryApi, FeatureConfigurationT skylarkFeatureConfiguration, CcToolchainProviderT skylarkCcToolchainProvider, - CompilationOutputsT compilationOutputs, + Object compilationOutputs, SkylarkList userLinkFlags, SkylarkList linkingContexts, String name, String language, String outputType, boolean linkDepsStatically, - SkylarkList additionalInputs, - Location location, - Environment environment, - StarlarkContext starlarkContext) + SkylarkList nonCodeInputs) throws InterruptedException, EvalException; @SkylarkCallable( name = "create_linking_context_from_compilation_outputs", - doc = - "Should be used for creating library rules that can propagate information downstream in" - + " order to be linked later by a top level rule that does transitive linking to" - + " create an executable or dynamic library.", - useLocation = true, - useEnvironment = true, - useContext = true, + documented = false, parameters = { @Param( name = "actions", @@ -355,16 +333,6 @@ LinkingOutputsT link( defaultValue = "[]", noneable = true, type = SkylarkList.class), - @Param( - name = "linking_contexts", - doc = - "Libraries from dependencies. These libraries will be linked into the output " - + "artifact of the link() call, be it a binary or a library.", - positional = false, - named = true, - noneable = true, - defaultValue = "[]", - type = SkylarkList.class), @Param( name = "name", doc = @@ -375,11 +343,11 @@ LinkingOutputsT link( type = String.class), @Param( name = "language", - doc = "Can be one of c++, objc or objc++.", + doc = "Can be one of C++, objc or objc++.", positional = false, named = true, noneable = true, - defaultValue = "'c++'", + defaultValue = "'C++'", type = String.class), @Param( name = "alwayslink", @@ -390,7 +358,7 @@ LinkingOutputsT link( defaultValue = "False", type = Boolean.class), @Param( - name = "additional_inputs", + name = "non_code_inputs", doc = "For additional inputs to the linking action, e.g.: linking scripts.", positional = false, named = true, @@ -404,28 +372,24 @@ LinkingOutputsT link( defaultValue = "False", type = Boolean.class), @Param( - name = "disallow_dynamic_library", - doc = "Whether a dynamic library should be created.", + name = "disallow_dynamic_libraries", + doc = "Whether dynamic libraries should be created.", positional = false, named = true, defaultValue = "False", type = Boolean.class) }) - Tuple createLinkingContextFromCompilationOutputs( + LinkingContextT createLinkingContextFromCompilationOutputs( SkylarkActionFactoryT skylarkActionFactoryApi, FeatureConfigurationT skylarkFeatureConfiguration, CcToolchainProviderT skylarkCcToolchainProvider, CompilationOutputsT compilationOutputs, SkylarkList userLinkFlags, - SkylarkList linkingContexts, String name, String language, boolean alwayslink, - SkylarkList additionalInputs, + SkylarkList nonCodeInputs, boolean disallowStaticLibraries, - boolean disallowDynamicLibraries, - Location location, - Environment environment, - StarlarkContext bazelStarlarkContext) + boolean disallowDynamicLibraries) throws InterruptedException, EvalException; } diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkingContextApi.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkingContextApi.java index 34671f42d7b..318d3273ce4 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkingContextApi.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkingContextApi.java @@ -18,7 +18,6 @@ import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; -import com.google.devtools.build.lib.syntax.Environment; import com.google.devtools.build.lib.syntax.SkylarkList; import com.google.devtools.build.lib.syntax.SkylarkNestedSet; @@ -29,7 +28,8 @@ doc = "Immutable store of information needed for C++ linking that is aggregated across " + "dependencies.") -public interface CcLinkingContextApi { +public interface CcLinkingContextApi< + FileT extends FileApi, LibraryToLinkT extends LibraryToLinkApi> { @SkylarkCallable( name = "user_link_flags", doc = "Returns the list of user link flags passed as strings.", @@ -38,16 +38,13 @@ public interface CcLinkingContextApi { @SkylarkCallable( name = "libraries_to_link", - doc = - "Returns the depset of LibraryToLink. May return a list but this is" - + "deprecated. See #8118.", - structField = true, - useEnvironment = true) - Object getSkylarkLibrariesToLink(Environment environment); + doc = "Returns the list of LibraryToLink.", + structField = true) + SkylarkList getSkylarkLibrariesToLink(); @SkylarkCallable( name = "additional_inputs", - doc = "Returns the depset of additional inputs, e.g.: linker scripts.", + doc = "Returns the list of additional inputs, e.g.: linker scripts.", structField = true) SkylarkNestedSet getSkylarkNonCodeInputs(); } diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcModuleApi.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcModuleApi.java index a0925df3eea..5d073b974a2 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcModuleApi.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcModuleApi.java @@ -36,7 +36,6 @@ name = "cc_common", doc = "Utilities for C++ compilation, linking, and command line generation.") public interface CcModuleApi< - SkylarkActionFactoryT extends SkylarkActionFactoryApi, FileT extends FileApi, CcToolchainProviderT extends CcToolchainProviderApi, FeatureConfigurationT extends FeatureConfigurationApi, @@ -45,8 +44,7 @@ public interface CcModuleApi< LibraryToLinkT extends LibraryToLinkApi, CcToolchainVariablesT extends CcToolchainVariablesApi, SkylarkRuleContextT extends SkylarkRuleContextApi, - CcToolchainConfigInfoT extends CcToolchainConfigInfoApi, - CompilationOutputsT extends CcCompilationOutputsApi> { + CcToolchainConfigInfoT extends CcToolchainConfigInfoApi> { @SkylarkCallable( name = "CcToolchainInfo", diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeCcModule.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeCcModule.java index ca2ea82f854..4e673203fd8 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeCcModule.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeCcModule.java @@ -50,8 +50,8 @@ public class FakeCcModule CcCompilationContextApi, CcCompilationOutputsApi, CcLinkingOutputsApi, - LibraryToLinkApi, - CcLinkingContextApi>, + CcLinkingContextApi, + LibraryToLinkApi, CcToolchainVariablesApi, CcToolchainConfigInfoApi> { @@ -179,37 +179,29 @@ public Tuple compile( SkylarkList privateHeaders, SkylarkList includes, SkylarkList quoteIncludes, - SkylarkList defines, SkylarkList systemIncludes, SkylarkList userCompileFlags, SkylarkList ccCompilationContexts, String name, boolean disallowPicOutputs, - boolean disallowNopicOutputs, - Location location, - Environment environment) + boolean disallowNopicOutputs) throws EvalException, InterruptedException { return null; } @Override - public Tuple createLinkingContextFromCompilationOutputs( + public CcLinkingContextApi createLinkingContextFromCompilationOutputs( SkylarkActionFactoryApi skylarkActionFactoryApi, FeatureConfigurationApi skylarkFeatureConfiguration, CcToolchainProviderApi skylarkCcToolchainProvider, CcCompilationOutputsApi compilationOutputs, SkylarkList userLinkFlags, - SkylarkList>> ccLinkingContextApis, String name, String language, boolean alwayslink, SkylarkList nonCodeInputs, boolean disallowStaticLibraries, - boolean disallowDynamicLibraries, - Object grepIncludes, - Location location, - Environment environment, - StarlarkContext starlarkContext) + boolean disallowDynamicLibraries) throws InterruptedException, EvalException { return null; } @@ -219,17 +211,14 @@ public CcLinkingOutputsApi link( SkylarkActionFactoryApi skylarkActionFactoryApi, FeatureConfigurationApi skylarkFeatureConfiguration, CcToolchainProviderApi skylarkCcToolchainProvider, - CcCompilationOutputsApi compilationOutputs, + Object compilationOutputs, SkylarkList userLinkFlags, - SkylarkList>> linkingContexts, + SkylarkList linkingContexts, String name, String language, String outputType, boolean linkDepsStatically, - SkylarkList additionalInputs, - Location location, - Environment environment, - StarlarkContext starlarkContext) + SkylarkList nonCodeInputs) throws InterruptedException, EvalException { return null; } diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java b/dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java index cd531a7f82b..cc4f24be122 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/lib/rules/cpp/SkylarkCcCommonTest.java @@ -37,7 +37,6 @@ import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.EnvSet; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Feature; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; -import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Flag.SingleChunkFlag; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FlagGroup; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FlagSet; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.Tool; @@ -2301,29 +2300,6 @@ private void createFlagGroupRule( scratch.file(pkg + "/BUILD", "load(':foo.bzl', 'crule')", "crule(name = 'a')"); } - @Test - public void testSingleChunkFlagIsUsed() throws Exception { - loadCcToolchainConfigLib(); - - createCustomFlagGroupRule( - "single_chunk_flag", - /* flags= */ "['a']", - /* flagGroups= */ "[]", - /* iterateOver= */ "''", - /* expandIfTrue= */ "''", - /* expandIfFalse= */ "''", - /* expandIfAvailable= */ "''", - /* expandIfNotAvailable= */ "''", - /* expandIfEqual= */ "None"); - - ConfiguredTarget t = getConfiguredTarget("//single_chunk_flag:a"); - SkylarkInfo flagGroupProvider = (SkylarkInfo) t.get("flaggroup"); - assertThat(flagGroupProvider).isNotNull(); - FlagGroup flagGroup = CcModule.flagGroupFromSkylark(flagGroupProvider); - assertThat(flagGroup.getExpandables()).isNotEmpty(); - assertThat(flagGroup.getExpandables().get(0)).isInstanceOf(SingleChunkFlag.class); - } - @Test public void testCustomFlagGroup() throws Exception { loadCcToolchainConfigLib();