Flip --incompatible_use_specific_tool_files.

    See bazelbuild/bazel#8531.

    Closes #9126.

    RELNOTES: The --incompatible_use_specific_tool_files flag has been flipped. See bazelbuild/bazel#9126 for more information.
    PiperOrigin-RevId: 263120622

Author: Luca Di Grazia

dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java

@@ -766,7 +766,7 @@ public Label getFdoPrefetchHintsLabel() {
 
   @Option(
       name = "incompatible_remove_legacy_whole_archive",
-      defaultValue = "true",
+      defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
       metadataTags = {
@@ -892,7 +892,7 @@ public Label getFdoPrefetchHintsLabel() {
 
   @Option(
       name = "incompatible_disable_nocopts",
-      defaultValue = "true",
+      defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.ACTION_COMMAND_LINES},
       metadataTags = {

dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/lib/packages/util/Crosstool.java

@@ -13,12 +13,9 @@
 // limitations under the License.
 package com.google.devtools.build.lib.packages.util;
 
-import static java.util.stream.Collectors.joining;
-
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.util.Crosstool.CcToolchainConfig;
 import com.google.devtools.build.lib.rules.cpp.CppRuleClasses;
 import com.google.devtools.build.lib.testutil.TestConstants;
@@ -59,8 +56,6 @@ public static final class CcToolchainConfig {
     private final ImmutableList<Pair<String, String>> toolPaths;
     private final ImmutableList<String> cxxBuiltinIncludeDirectories;
     private final ImmutableList<Pair<String, String>> makeVariables;
-    private final ImmutableList<String> toolchainExecConstraints;
-    private final ImmutableList<String> toolchainTargetConstraints;
 
     private CcToolchainConfig(
         String cpu,
@@ -78,9 +73,7 @@ private CcToolchainConfig(
         ImmutableList<ImmutableList<String>> artifactNamePatterns,
         ImmutableList<Pair<String, String>> toolPaths,
         ImmutableList<String> cxxBuiltinIncludeDirectories,
-        ImmutableList<Pair<String, String>> makeVariables,
-        ImmutableList<String> toolchainExecConstraints,
-        ImmutableList<String> toolchainTargetConstraints) {
+        ImmutableList<Pair<String, String>> makeVariables) {
       this.cpu = cpu;
       this.compiler = compiler;
       this.toolchainIdentifier = toolchainIdentifier;
@@ -97,8 +90,6 @@ private CcToolchainConfig(
       this.cxxBuiltinIncludeDirectories = cxxBuiltinIncludeDirectories;
       this.makeVariables = makeVariables;
       this.ccTargetOs = ccTargetOs;
-      this.toolchainExecConstraints = toolchainExecConstraints;
-      this.toolchainTargetConstraints = toolchainTargetConstraints;
     }
 
     public static Builder builder() {
@@ -123,8 +114,6 @@ public static class Builder {
       private String targetLibc = "local";
       private String abiVersion = "local";
       private String abiLibcVersion = "local";
-      private ImmutableList<String> toolchainExecConstraints = ImmutableList.of();
-      private ImmutableList<String> toolchainTargetConstraints = ImmutableList.of();
 
       public Builder withCpu(String cpu) {
         this.cpu = cpu;
@@ -212,16 +201,6 @@ public Builder withMakeVariables(Pair<String, String>... makeVariables) {
         return this;
       }
 
-      public Builder withToolchainExecConstraints(String... execConstraints) {
-        this.toolchainExecConstraints = ImmutableList.copyOf(execConstraints);
-        return this;
-      }
-
-      public Builder withToolchainTargetConstraints(String... targetConstraints) {
-        this.toolchainTargetConstraints = ImmutableList.copyOf(targetConstraints);
-        return this;
-      }
-
       public CcToolchainConfig build() {
         return new CcToolchainConfig(
             cpu,
@@ -239,9 +218,7 @@ public CcToolchainConfig build() {
             artifactNamePatterns,
             toolPaths,
             cxxBuiltinIncludeDirectories,
-            makeVariables,
-            toolchainExecConstraints,
-            toolchainTargetConstraints);
+            makeVariables);
       }
     }
 
@@ -257,35 +234,6 @@ public String getCompiler() {
       return compiler;
     }
 
-    private static String formatConstraints(String type, ImmutableList<String> constraints) {
-      if (constraints.isEmpty()) {
-        return "";
-      }
-
-      String output =
-          constraints.stream()
-              .map(constraint -> String.format("'%s',", constraint))
-              .collect(joining("\n"));
-
-      return String.format("%s_compatible_with = [\n%s\n],", type, output);
-    }
-
-    public String getToolchainExecConstraints() {
-      return formatConstraints("exec", toolchainExecConstraints);
-    }
-
-    public String getToolchainTargetConstraints() {
-      ImmutableList<String> constraints = this.toolchainTargetConstraints;
-      if (constraints.isEmpty() && getTargetCpu().equals("k8")) {
-        // Use default constraints
-        constraints =
-            ImmutableList.of(
-                TestConstants.CONSTRAINTS_PACKAGE_ROOT + "cpu:x86_64",
-                TestConstants.CONSTRAINTS_PACKAGE_ROOT + "os:linux");
-      }
-      return formatConstraints("target", constraints);
-    }
-
     public boolean hasStaticLinkCppRuntimesFeature() {
       return features.contains(CppRuleClasses.STATIC_LINK_CPP_RUNTIMES);
     }
@@ -307,9 +255,7 @@ public static CcToolchainConfig getCcToolchainConfigForCpu(String cpu) {
           /* artifactNamePatterns= */ ImmutableList.of(),
           /* toolPaths= */ ImmutableList.of(),
           /* cxxBuiltinIncludeDirectories= */ ImmutableList.of(),
-          /* makeVariables= */ ImmutableList.of(),
-          /* toolchainExecConstraints= */ ImmutableList.of(),
-          /* toolchainTargetConstraints= */ ImmutableList.of());
+          /* makeVariables= */ ImmutableList.of());
     }
 
     public static CcToolchainConfig getDefaultCcToolchainConfig() {
@@ -377,16 +323,14 @@ public String getCcToolchainConfigRule() {
   private final MockToolsConfig config;
 
   private final String crosstoolTop;
-  private final Label crosstoolTopLabel;
   private String ccToolchainConfigFileContents;
   private ImmutableList<String> archs;
   private boolean supportsHeaderParsing;
   private ImmutableList<CcToolchainConfig> ccToolchainConfigList = ImmutableList.of();
 
-  Crosstool(MockToolsConfig config, String crosstoolTop, Label crosstoolTopLabel) {
+  Crosstool(MockToolsConfig config, String crosstoolTop) {
     this.config = config;
     this.crosstoolTop = crosstoolTop;
-    this.crosstoolTopLabel = crosstoolTopLabel;
   }
 
   public Crosstool setCcToolchainFile(String ccToolchainConfigFileContents) {
@@ -483,12 +427,8 @@ public void write() throws IOException {
               .join(
                   "toolchain(",
                   "  name = 'cc-toolchain-" + suffix + "',",
-                  "  toolchain_type = '"
-                      + TestConstants.TOOLS_REPOSITORY
-                      + "//tools/cpp:toolchain_type',",
+                  "  toolchain_type = ':toolchain_type',",
                   "  toolchain = ':cc-compiler-" + suffix + "',",
-                  toolchain.getToolchainExecConstraints(),
-                  toolchain.getToolchainTargetConstraints(),
                   ")",
                   toolchain.getCcToolchainConfigRule(),
                   "cc_toolchain(",
@@ -557,12 +497,17 @@ public void write() throws IOException {
     config.create(crosstoolTop + "/mock_version/x86/bin/ld");
     config.overwrite(crosstoolTop + "/BUILD", build);
     config.overwrite(crosstoolTop + "/cc_toolchain_config.bzl", ccToolchainConfigFileContents);
+    config.overwrite(
+        TestConstants.TOOLS_REPOSITORY_SCRATCH + "tools/cpp/cc_toolchain_config_lib.bzl",
+        ResourceLoader.readFromResources(
+            TestConstants.BAZEL_REPO_PATH + "tools/cpp/cc_toolchain_config_lib.bzl"));
+    config.overwrite(
+        TestConstants.TOOLS_REPOSITORY_SCRATCH + "tools/build_defs/cc/action_names.bzl",
+        ResourceLoader.readFromResources(
+            TestConstants.BAZEL_REPO_PATH + "tools/build_defs/cc/action_names.bzl"));
+    config.create(TestConstants.TOOLS_REPOSITORY_SCRATCH + "tools/build_defs/cc/BUILD");
+    config.append(TestConstants.TOOLS_REPOSITORY_SCRATCH + "tools/cpp/BUILD", "");
     config.create(crosstoolTop + "/crosstool.cppmap", "module crosstool {}");
-    config.append(
-        "WORKSPACE",
-        String.format(
-            "register_toolchains('%s:all')",
-            crosstoolTopLabel.getPackageIdentifier().getCanonicalForm()));
   }
 
   public void writeOSX() throws IOException {
@@ -638,7 +583,6 @@ public void writeOSX() throws IOException {
           "    objcopy_files = ':empty',",
           "    strip_files = ':empty',",
           "    supports_param_files = 0,",
-          supportsHeaderParsing ? "    supports_header_parsing = 1," : "",
           ")",
           "toolchain(name = 'cc-toolchain-" + toolchainConfig.getTargetCpu() + "',",
           "    exec_compatible_with = [],",
@@ -657,5 +601,15 @@ public void writeOSX() throws IOException {
         MockObjcSupport.DEFAULT_OSX_CROSSTOOL_DIR + "/BUILD",
         Joiner.on("\n").join(crosstoolBuild.build()));
     config.overwrite(crosstoolTop + "/cc_toolchain_config.bzl", ccToolchainConfigFileContents);
+    config.overwrite(
+        TestConstants.TOOLS_REPOSITORY_SCRATCH + "tools/cpp/cc_toolchain_config_lib.bzl",
+        ResourceLoader.readFromResources(
+            TestConstants.BAZEL_REPO_PATH + "tools/cpp/cc_toolchain_config_lib.bzl"));
+    config.overwrite(
+        TestConstants.TOOLS_REPOSITORY_SCRATCH + "tools/build_defs/cc/action_names.bzl",
+        ResourceLoader.readFromResources(
+            TestConstants.BAZEL_REPO_PATH + "tools/build_defs/cc/action_names.bzl"));
+    config.overwrite(TestConstants.TOOLS_REPOSITORY_SCRATCH + "tools/build_defs/cc/BUILD");
+    config.append(TestConstants.TOOLS_REPOSITORY_SCRATCH + "tools/cpp/BUILD", "");
   }
 }