diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java index 8120fc4add8..1c601a04d1d 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/apple/cpp/AppleCcToolchain.java @@ -77,7 +77,7 @@ private static CcToolchainVariables computeCcToolchainVariables( String cpu = buildOptions.get(Options.class).cpu; Map appleEnv = getEnvironmentBuildVariables(xcodeConfig, cpu); - CcToolchainVariables.Builder variables = CcToolchainVariables.builder(); + CcToolchainVariables.Builder variables = new CcToolchainVariables.Builder(); variables .addStringVariable( XCODE_VERSION_KEY, xcodeConfig.getXcodeVersion().toStringWithMinimumComponents(2)) diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java index 056201cef83..46e2a5905cb 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java @@ -917,13 +917,7 @@ public static String computeCcFlags(RuleContext ruleContext, TransitiveInfoColle String originalCcFlags = toolchainProvider.getLegacyCcFlagsMakeVariable(); // Ensure that Sysroot is set properly. - // TODO(b/129045294): We assume --incompatible_disable_genrule_cc_toolchain_dependency will - // be flipped sooner than --incompatible_enable_cc_toolchain_resolution. Then this method - // will be gone. - String sysrootCcFlags = - computeCcFlagForSysroot( - toolchainProvider.getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas(), - toolchainProvider); + String sysrootCcFlags = computeCcFlagForSysroot(toolchainProvider); // Fetch additional flags from the FeatureConfiguration. List featureConfigCcFlags = @@ -948,9 +942,8 @@ private static boolean containsSysroot(String ccFlags, List moreCcFlags) .anyMatch(str -> str.contains(SYSROOT_FLAG)); } - private static String computeCcFlagForSysroot( - CppConfiguration cppConfiguration, CcToolchainProvider toolchainProvider) { - PathFragment sysroot = toolchainProvider.getSysrootPathFragment(cppConfiguration); + private static String computeCcFlagForSysroot(CcToolchainProvider toolchainProvider) { + PathFragment sysroot = toolchainProvider.getSysrootPathFragment(); String sysrootFlag = ""; if (sysroot != null) { sysrootFlag = SYSROOT_FLAG + sysroot; diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java index 04035db7780..92511377f0a 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java @@ -875,7 +875,7 @@ private PublicHeaders computePublicHeaders() { */ private CcCompilationContext initializeCcCompilationContext() { CcCompilationContext.Builder ccCompilationContextBuilder = - CcCompilationContext.builder(actionConstructionContext, configuration, label); + new CcCompilationContext.Builder(actionConstructionContext, configuration, label); // Setup the include path; local include directories come before those inherited from deps or // from the toolchain; in case of aliasing (same include file found on different entries), @@ -1214,7 +1214,7 @@ private NestedSet getSourceArtifactsByType( * specified on the current object. This method should only be called once. */ private CcCompilationOutputs createCcCompileActions() throws RuleErrorException { - CcCompilationOutputs.Builder result = CcCompilationOutputs.builder(); + CcCompilationOutputs.Builder result = new CcCompilationOutputs.Builder(); Preconditions.checkNotNull(ccCompilationContext); if (shouldProvideHeaderModules()) { 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 dd5c0dd0554..57dbe93889b 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 @@ -503,7 +503,7 @@ public CcCompilationContext createCcCompilationContext( Object headers, Object systemIncludes, Object includes, Object quoteIncludes, Object defines) throws EvalException { CcCompilationContext.Builder ccCompilationContext = - CcCompilationContext.builder( + new CcCompilationContext.Builder( /* actionConstructionContext= */ null, /* configuration= */ null, /* label= */ null); ccCompilationContext.addDeclaredIncludeSrcs( toNestedSetOfArtifacts(headers, "headers").getSet(Artifact.class)); diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java index ded613f3a3f..c74606f81fc 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java @@ -25,11 +25,9 @@ import com.google.devtools.build.lib.analysis.RunfilesProvider; import com.google.devtools.build.lib.analysis.TemplateVariableInfo; import com.google.devtools.build.lib.analysis.config.BuildOptions; -import com.google.devtools.build.lib.analysis.platform.ToolchainInfo; -import com.google.devtools.build.lib.cmdline.Label; +import com.google.devtools.build.lib.events.Location; import java.io.Serializable; import java.util.HashMap; -import net.starlark.java.syntax.Location; /** * Implementation for the cc_toolchain rule. @@ -44,27 +42,9 @@ public class CcToolchain implements RuleConfiguredTargetFactory { /** Default attribute name for the c++ toolchain type */ public static final String CC_TOOLCHAIN_TYPE_ATTRIBUTE_NAME = "$cc_toolchain_type"; - public static final String ALLOWED_LAYERING_CHECK_FEATURES_ALLOWLIST = - "disabling_parse_headers_and_layering_check_allowed"; - public static final String ALLOWED_LAYERING_CHECK_FEATURES_TARGET = - "@bazel_tools//tools/build_defs/cc/whitelists/parse_headers_and_layering_check:" - + ALLOWED_LAYERING_CHECK_FEATURES_ALLOWLIST; - public static final Label ALLOWED_LAYERING_CHECK_FEATURES_LABEL = - Label.parseAbsoluteUnchecked(ALLOWED_LAYERING_CHECK_FEATURES_TARGET); - - public static final String LOOSE_HEADER_CHECK_ALLOWLIST = - "loose_header_check_allowed_in_toolchain"; - public static final String LOOSE_HEADER_CHECK_TARGET = - "@bazel_tools//tools/build_defs/cc/whitelists/starlark_hdrs_check:" + LOOSE_HEADER_CHECK_ALLOWLIST; - public static final Label LOOSE_HEADER_CHECK_LABEL = - Label.parseAbsoluteUnchecked(LOOSE_HEADER_CHECK_TARGET); - @Override public ConfiguredTarget create(RuleContext ruleContext) throws InterruptedException, RuleErrorException, ActionConflictException { - if (!isAppleToolchain()) { - CcCommon.checkRuleLoadedThroughMacro(ruleContext); - } validateToolchain(ruleContext); CcToolchainAttributesProvider attributes = new CcToolchainAttributesProvider( @@ -82,16 +62,15 @@ public ConfiguredTarget create(RuleContext ruleContext) if (!CppHelper.useToolchainResolution(ruleContext)) { // This is not a platforms-backed build, let's provide CcToolchainAttributesProvider // and have cc_toolchain_suite select one of its toolchains and create CcToolchainProvider - // from its attributes. We also need to provide a do-nothing ToolchainInfo. - return ruleConfiguredTargetBuilder - .addNativeDeclaredProvider(new ToolchainInfo(ImmutableMap.of("cc", "dummy cc toolchain"))) - .build(); + // from its attributes. + return ruleConfiguredTargetBuilder.build(); } // This is a platforms-backed build, we will not analyze cc_toolchain_suite at all, and we are // sure current cc_toolchain is the one selected. We can create CcToolchainProvider here. CcToolchainProvider ccToolchainProvider = - CcToolchainProviderHelper.getCcToolchainProvider(ruleContext, attributes); + CcToolchainProviderHelper.getCcToolchainProvider( + ruleContext, attributes, /* crosstoolFromCcToolchainSuiteProtoAttribute= */ null); if (ccToolchainProvider == null) { // Skyframe restart diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainAttributesProvider.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainAttributesProvider.java index 6f0a7b6961d..3f1ce3add74 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainAttributesProvider.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainAttributesProvider.java @@ -66,10 +66,6 @@ public class CcToolchainAttributesProvider extends ToolchainInfo implements HasC private final Label libcTopAttribute; private final NestedSet libc; private final NestedSet libcMiddleman; - private final TransitiveInfoCollection libcTop; - private final NestedSet targetLibc; - private final NestedSet targetLibcMiddleman; - private final TransitiveInfoCollection targetLibcTop; private final NestedSet fullInputsForCrosstool; private final NestedSet fullInputsForLink; private final NestedSet coverage; @@ -82,6 +78,7 @@ public class CcToolchainAttributesProvider extends ToolchainInfo implements HasC private final TransitiveInfoCollection fdoOptimize; private final ImmutableList fdoOptimizeArtifacts; private final FdoPrefetchHintsProvider fdoPrefetch; + private final TransitiveInfoCollection libcTop; private final TransitiveInfoCollection moduleMap; private final Artifact moduleMapArtifact; private final Artifact zipper; @@ -133,21 +130,9 @@ public CcToolchainAttributesProvider( this.arFiles = getOptionalMiddlemanOrFiles(ruleContext, "ar_files"); this.linkerFiles = getMiddlemanOrFiles(ruleContext, "linker_files"); this.dwpFiles = getMiddlemanOrFiles(ruleContext, "dwp_files"); - this.libcMiddleman = getOptionalMiddlemanOrFiles(ruleContext, CcToolchainRule.LIBC_TOP_ATTR, Mode.TARGET); this.libc = getOptionalFiles(ruleContext, CcToolchainRule.LIBC_TOP_ATTR, Mode.TARGET); - this.libcTop = ruleContext.getPrerequisite(CcToolchainRule.LIBC_TOP_ATTR, Mode.TARGET); - - this.targetLibcMiddleman = - getOptionalMiddlemanOrFiles(ruleContext, CcToolchainRule.TARGET_LIBC_TOP_ATTR, Mode.TARGET); - this.targetLibc = - getOptionalFiles(ruleContext, CcToolchainRule.TARGET_LIBC_TOP_ATTR, Mode.TARGET); - this.targetLibcTop = - ruleContext.getPrerequisite(CcToolchainRule.TARGET_LIBC_TOP_ATTR, Mode.TARGET); - - this.libcTopAttribute = ruleContext.attributes().get("libc_top", BuildType.LABEL); - this.fullInputsForCrosstool = NestedSetBuilder.stableOrder() .addTransitive(allFilesMiddleman) @@ -179,6 +164,8 @@ public CcToolchainAttributesProvider( this.fdoPrefetch = ruleContext.getPrerequisite( ":fdo_prefetch_hints", Mode.TARGET, FdoPrefetchHintsProvider.PROVIDER); + this.libcTopAttribute = ruleContext.attributes().get("libc_top", BuildType.LABEL); + this.libcTop = ruleContext.getPrerequisite(CcToolchainRule.LIBC_TOP_ATTR, Mode.TARGET); this.moduleMap = ruleContext.getPrerequisite("module_map", Mode.HOST); this.moduleMapArtifact = ruleContext.getPrerequisiteArtifact("module_map", Mode.HOST); this.zipper = ruleContext.getPrerequisiteArtifact(":zipper", Mode.HOST); @@ -376,22 +363,6 @@ public NestedSet getLibc() { return libc; } - public NestedSet getTargetLibc() { - return targetLibc; - } - - public TransitiveInfoCollection getTargetLibcTop() { - return targetLibcTop; - } - - public Label getLibcTopLabel() { - return getLibcTop() == null ? null : getLibcTop().getLabel(); - } - - public Label getTargetLibcTopLabel() { - return getTargetLibcTop() == null ? null : getTargetLibcTop().getLabel(); - } - public Label getLibcTopAttribute() { return libcTopAttribute; } @@ -458,6 +429,10 @@ private static NestedSet fullInputsForLink( } return builder.build(); } + + public Label getLibcTopLabel() { + return getLibcTop() == null ? null : getLibcTop().getLabel(); + } } /** diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java index 2a74dc05396..4153a0d6335 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProvider.java @@ -67,7 +67,6 @@ public final class CcToolchainProvider extends ToolchainInfo /* dwpFiles= */ NestedSetBuilder.emptySet(Order.STABLE_ORDER), /* coverageFiles= */ NestedSetBuilder.emptySet(Order.STABLE_ORDER), /* libcLink= */ NestedSetBuilder.emptySet(Order.STABLE_ORDER), - /* targetLibcLink= */ NestedSetBuilder.emptySet(Order.STABLE_ORDER), /* staticRuntimeLinkInputs= */ NestedSetBuilder.emptySet(Order.STABLE_ORDER), /* staticRuntimeLinkMiddleman= */ null, /* dynamicRuntimeLinkInputs= */ NestedSetBuilder.emptySet(Order.STABLE_ORDER), @@ -79,11 +78,9 @@ public final class CcToolchainProvider extends ToolchainInfo (buildOptions) -> CcToolchainVariables.EMPTY, CcToolchainVariables.EMPTY, /* builtinIncludeFiles= */ ImmutableList.of(), - /* targetBuiltinIncludeFiles= */ ImmutableList.of(), /* linkDynamicLibraryTool= */ null, /* builtInIncludeDirectories= */ ImmutableList.of(), /* sysroot= */ null, - /* targetSysroot= */ null, /* fdoContext= */ null, /* isHostConfiguration= */ false, /* licensesProvider= */ null); @@ -104,7 +101,6 @@ public final class CcToolchainProvider extends ToolchainInfo private final NestedSet dwpFiles; private final NestedSet coverageFiles; private final NestedSet libcLink; - private final NestedSet targetLibcLink; @Nullable private final NestedSet staticRuntimeLinkInputs; @Nullable private final Artifact staticRuntimeLinkMiddleman; @Nullable private final NestedSet dynamicRuntimeLinkInputs; @@ -116,11 +112,9 @@ public final class CcToolchainProvider extends ToolchainInfo private final AdditionalBuildVariablesComputer additionalBuildVariablesComputer; private final CcToolchainVariables buildVariables; private final ImmutableList builtinIncludeFiles; - private final ImmutableList targetBuiltinIncludeFiles; @Nullable private final Artifact linkDynamicLibraryTool; private final ImmutableList builtInIncludeDirectories; @Nullable private final PathFragment sysroot; - private final PathFragment targetSysroot; private final boolean isHostConfiguration; /** * WARNING: We don't like {@link FdoContext}. Its {@link FdoContext#fdoProfilePath} is pure path @@ -149,7 +143,6 @@ public CcToolchainProvider( NestedSet dwpFiles, NestedSet coverageFiles, NestedSet libcLink, - NestedSet targetLibcLink, NestedSet staticRuntimeLinkInputs, @Nullable Artifact staticRuntimeLinkMiddleman, NestedSet dynamicRuntimeLinkInputs, @@ -161,11 +154,9 @@ public CcToolchainProvider( AdditionalBuildVariablesComputer additionalBuildVariablesComputer, CcToolchainVariables buildVariables, ImmutableList builtinIncludeFiles, - ImmutableList targetBuiltinIncludeFiles, Artifact linkDynamicLibraryTool, ImmutableList builtInIncludeDirectories, @Nullable PathFragment sysroot, - @Nullable PathFragment targetSysroot, FdoContext fdoContext, boolean isHostConfiguration, LicensesProvider licensesProvider) { @@ -186,7 +177,6 @@ public CcToolchainProvider( this.dwpFiles = Preconditions.checkNotNull(dwpFiles); this.coverageFiles = Preconditions.checkNotNull(coverageFiles); this.libcLink = Preconditions.checkNotNull(libcLink); - this.targetLibcLink = Preconditions.checkNotNull(targetLibcLink); this.staticRuntimeLinkInputs = staticRuntimeLinkInputs; this.staticRuntimeLinkMiddleman = staticRuntimeLinkMiddleman; this.dynamicRuntimeLinkInputs = dynamicRuntimeLinkInputs; @@ -202,11 +192,9 @@ public CcToolchainProvider( this.additionalBuildVariablesComputer = additionalBuildVariablesComputer; this.buildVariables = buildVariables; this.builtinIncludeFiles = builtinIncludeFiles; - this.targetBuiltinIncludeFiles = targetBuiltinIncludeFiles; this.linkDynamicLibraryTool = linkDynamicLibraryTool; this.builtInIncludeDirectories = builtInIncludeDirectories; this.sysroot = sysroot; - this.targetSysroot = targetSysroot; this.fdoContext = fdoContext == null ? FdoContext.getDisabledContext() : fdoContext; this.isHostConfiguration = isHostConfiguration; this.licensesProvider = licensesProvider; @@ -426,12 +414,8 @@ public NestedSet getCoverageFiles() { return coverageFiles; } - public NestedSet getLibcLink(CppConfiguration cppConfiguration) { - if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas())) { - return libcLink; - } else { - return targetLibcLink; - } + public NestedSet getLibcLink() { + return libcLink; } /** @@ -611,7 +595,7 @@ public CcToolchainVariables getBuildVariables( return CcToolchainProviderHelper.getBuildVariables( buildOptions, cppConfiguration, - getSysrootPathFragment(cppConfiguration), + getSysrootPathFragment(), additionalBuildVariablesComputer); } return buildVariables; @@ -620,15 +604,9 @@ public CcToolchainVariables getBuildVariables( /** * Return the set of include files that may be included even if they are not mentioned in the * source file or any of the headers included by it. - * - * @param cppConfiguration */ - public ImmutableList getBuiltinIncludeFiles(CppConfiguration cppConfiguration) { - if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas())) { - return builtinIncludeFiles; - } else { - return targetBuiltinIncludeFiles; - } + public ImmutableList getBuiltinIncludeFiles() { + return builtinIncludeFiles; } /** @@ -652,12 +630,8 @@ public String getSysroot() { return sysroot != null ? sysroot.getPathString() : null; } - public PathFragment getSysrootPathFragment(CppConfiguration cppConfiguration) { - if (cppConfiguration.equals(getCppConfigurationEvenThoughItCanBeDifferentThatWhatTargetHas())) { - return sysroot; - } else { - return targetSysroot; - } + public PathFragment getSysrootPathFragment() { + return sysroot; } /** diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java index 895736b29eb..0ab80aa48be 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java @@ -215,8 +215,6 @@ public static CcToolchainProvider getCcToolchainProvider( PathFragment sysroot = calculateSysroot(attributes.getLibcTopLabel(), toolchainInfo.getDefaultSysroot()); - PathFragment targetSysroot = - calculateSysroot(attributes.getTargetLibcTopLabel(), toolchainInfo.getDefaultSysroot()); ImmutableList.Builder builtInIncludeDirectoriesBuilder = ImmutableList.builder(); for (String s : toolchainInfo.getRawBuiltInIncludeDirectories()) { @@ -248,7 +246,6 @@ public static CcToolchainProvider getCcToolchainProvider( attributes.getDwpFiles(), attributes.getCoverage(), attributes.getLibc(), - attributes.getTargetLibc(), staticRuntimeLinkInputs, staticRuntimeLinkMiddleman, dynamicRuntimeLinkSymlinks, @@ -264,11 +261,9 @@ public static CcToolchainProvider getCcToolchainProvider( sysroot, attributes.getAdditionalBuildVariablesComputer()), getBuiltinIncludes(attributes.getLibc()), - getBuiltinIncludes(attributes.getTargetLibc()), attributes.getLinkDynamicLibraryTool(), builtInIncludeDirectories, sysroot, - targetSysroot, fdoContext, configuration.isHostConfiguration(), attributes.getLicensesProvider()); @@ -507,6 +502,20 @@ private static CppModuleMap createCrosstoolModuleMap(CcToolchainAttributesProvid return new CppModuleMap(moduleMapArtifact, "crosstool"); } + static TransitiveInfoCollection selectDep( + ImmutableList deps, Label label) { + if (deps.isEmpty()) { + return null; + } + for (TransitiveInfoCollection dep : deps) { + if (dep.getLabel().equals(label)) { + return dep; + } + } + + return deps.get(0); + } + /** * Returns {@link CcToolchainVariables} instance with build variables that only depend on the * toolchain. diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java index e8d823aea43..20da8bba91a 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java @@ -194,7 +194,7 @@ public static CcToolchainVariables setupVariablesOrThrowEvalException( Preconditions.checkNotNull(systemIncludeDirs); Preconditions.checkNotNull(defines); CcToolchainVariables.Builder buildVariables = - CcToolchainVariables.builder( + new CcToolchainVariables.Builder( ccToolchainProvider.getBuildVariables(buildOptions, cppConfiguration)); buildVariables.addStringSequenceVariable( diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java index 45da17b6a49..91dd23a1dfb 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java @@ -612,13 +612,6 @@ public Label getLibcTopLabel() { return cppOptions.libcTopLabel; } - /** - * Returns the value of the libc top-level directory (--grte_top) as specified on the command line - */ - public Label getTargetLibcTopLabel() { - return cppOptions.targetLibcTopLabel; - } - public boolean disableGenruleCcToolchainDependency() { return cppOptions.disableGenruleCcToolchainDependency; } diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java index 3653e1404cc..9743d9361b0 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java @@ -633,7 +633,7 @@ public static void createStripAction( } CcToolchainVariables variables = - CcToolchainVariables.builder( + new CcToolchainVariables.Builder( toolchain.getBuildVariables( ruleContext.getConfiguration().getOptions(), cppConfiguration)) .addStringVariable( diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java index e1c347bc56a..d48d3f880e5 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java @@ -833,7 +833,7 @@ public CppLinkAction build() throws InterruptedException { // Add build variables necessary to template link args into the crosstool. CcToolchainVariables.Builder buildVariablesBuilder = - CcToolchainVariables.builder( + new CcToolchainVariables.Builder( toolchain.getBuildVariables( ruleContext.getConfiguration().getOptions(), cppConfiguration)); Preconditions.checkState(!isLtoIndexing || allowLtoIndexing); diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java index 1b9ec5f1951..e89e359bc3e 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java @@ -18,14 +18,12 @@ 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.actions.ActionConstructionContext; -import com.google.devtools.build.lib.analysis.config.BuildConfiguration; +import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.packages.RuleErrorConsumer; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; import com.google.devtools.build.lib.vfs.PathFragment; import java.util.regex.Pattern; -import javax.annotation.Nullable; /** Handles creation of CppCompileAction used to compile linkstamp sources. */ public class CppLinkstampCompileHelper { @@ -36,10 +34,7 @@ public class CppLinkstampCompileHelper { * @param inputsForInvalidation: see {@link CppCompileAction#inputsForInvalidation} */ public static CppCompileAction createLinkstampCompileAction( - RuleErrorConsumer ruleErrorConsumer, - ActionConstructionContext actionConstructionContext, - @Nullable Artifact grepIncludes, - BuildConfiguration configuration, + RuleContext ruleContext, Artifact sourceFile, Artifact outputFile, Iterable compilationInputs, @@ -57,12 +52,11 @@ public static CppCompileAction createLinkstampCompileAction( String outputReplacement, CppSemantics semantics) { CppCompileActionBuilder builder = - new CppCompileActionBuilder( - actionConstructionContext, grepIncludes, ccToolchainProvider, configuration) + new CppCompileActionBuilder(ruleContext, ccToolchainProvider) .addMandatoryInputs(compilationInputs) .setVariables( getVariables( - ruleErrorConsumer, + ruleContext, sourceFile, outputFile, labelReplacement, @@ -70,7 +64,7 @@ public static CppCompileAction createLinkstampCompileAction( additionalLinkstampDefines, buildInfoHeaderArtifacts, featureConfiguration, - configuration.getOptions(), + ruleContext.getConfiguration().getOptions(), cppConfiguration, ccToolchainProvider, needsPic, @@ -86,7 +80,8 @@ public static CppCompileAction createLinkstampCompileAction( .setShareable(true) .setShouldScanIncludes(false) .setActionName(CppActionNames.LINKSTAMP_COMPILE); - semantics.finalizeCompileActionBuilder(configuration, featureConfiguration, builder); + semantics.finalizeCompileActionBuilder( + ruleContext.getConfiguration(), featureConfiguration, builder); return builder.buildOrThrowIllegalStateException(); } diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/FeatureConfigurationForStarlark.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/FeatureConfigurationForStarlark.java index 1b63cda8fb8..7f4f4f0b168 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/FeatureConfigurationForStarlark.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/FeatureConfigurationForStarlark.java @@ -14,12 +14,10 @@ package com.google.devtools.build.lib.rules.cpp; -import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; import com.google.devtools.build.lib.skylarkbuildapi.cpp.FeatureConfigurationApi; -import com.google.devtools.build.lib.syntax.Printer; /** * Wrapper for {@link FeatureConfiguration}, {@link CppConfiguration}, and {@link BuildOptions}. @@ -57,13 +55,6 @@ public FeatureConfiguration getFeatureConfiguration() { return featureConfiguration; } - @Override - public void debugPrint(Printer printer) { - printer.append(""); - } - /** * Get {@link CppConfiguration} that is threaded along with {@link FeatureConfiguration}. Do this * only when you're completely aware of why this method was added and hlopko@ allowed you to. diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java index ac2da3dccf9..c7acd792b20 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariables.java @@ -114,7 +114,7 @@ public static CcToolchainVariables setupVariables( boolean addIfsoRelatedVariables) throws EvalException { CcToolchainVariables.Builder buildVariables = - CcToolchainVariables.builder( + new CcToolchainVariables.Builder( ccToolchainProvider.getBuildVariables(buildOptions, cppConfiguration)); // pic diff --git a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendArtifacts.java b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendArtifacts.java index 12434f12a23..2bdcf909977 100644 --- a/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendArtifacts.java +++ b/dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/LtoBackendArtifacts.java @@ -224,7 +224,7 @@ private void scheduleLtoBackendAction( builder.setExecutable(compiler); CcToolchainVariables.Builder buildVariablesBuilder = - CcToolchainVariables.builder( + new CcToolchainVariables.Builder( ccToolchain.getBuildVariables( ruleContext.getConfiguration().getOptions(), ruleContext.getFragment(CppConfiguration.class)));