Remove explicitly set target platform value and replace it by fallback.

    The original value for the target platform was set at the dawn of time when we didn't have auto-calculation for it yet. Now that we do the explicit setting interferes with platform mapping which assumes that the target platform value is empty unless the user explicitly requests otherwise.

    This change introduces a new flag, --target_platform_fallsback which can be used to set the fallback in case there is no matching mapping. Because it uses the old defaults no behavioral change should be observed as long as no mappings exist.

    Step 5/N towards the platforms mapping functionality for bazelbuild/bazel#6426

    RELNOTES: None.
    PiperOrigin-RevId: 241031610

Author: Luca Di Grazia

dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java

@@ -183,6 +183,7 @@ public class PlatformOptions extends FragmentOptions {
 
   @Option(
       name = "incompatible_use_toolchain_resolution_for_java_rules",
+      oldName = "experimental_use_toolchain_resolution_for_java_rules",
       defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = OptionEffectTag.UNKNOWN,

dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingFunctionTest.java

@@ -25,7 +25,6 @@
 import com.google.devtools.build.lib.analysis.PlatformOptions;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
-import com.google.devtools.build.lib.analysis.config.CoreOptions;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -54,7 +53,8 @@ public class PlatformMappingFunctionTest extends BuildViewTestCase {
       ImmutableSet.of(PlatformConfiguration.class);
 
   private static final ImmutableList<Class<? extends FragmentOptions>>
-      BUILD_CONFIG_PLATFORM_OPTIONS = ImmutableList.of(CoreOptions.class, PlatformOptions.class);
+      BUILD_CONFIG_PLATFORM_OPTIONS =
+          ImmutableList.of(BuildConfiguration.Options.class, PlatformOptions.class);
 
   private static final Label PLATFORM1 = Label.parseAbsoluteUnchecked("//platforms:one");
 
@@ -83,7 +83,7 @@ public void testMappingFileDoesNotExistDefaultLocation() throws Exception {
         executeFunction(PlatformMappingValue.Key.create(null));
 
     BuildConfigurationValue.Key key =
-        BuildConfigurationValue.keyWithoutPlatformMapping(PLATFORM_FRAGMENT_CLASS, EMPTY_DIFF);
+        BuildConfigurationValue.key(PLATFORM_FRAGMENT_CLASS, EMPTY_DIFF);
 
     BuildConfigurationValue.Key mapped =
         platformMappingValue.map(key, DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS);
@@ -121,7 +121,7 @@ public void testMappingFileIsRead() throws Exception {
         platformMappingValue.map(
             keyForOptions(modifiedOptions), DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS);
 
-    assertThat(toMappedOptions(mapped).get(CoreOptions.class).cpu).isEqualTo("one");
+    assertThat(toMappedOptions(mapped).get(BuildConfiguration.Options.class).cpu).isEqualTo("one");
   }
 
   private PlatformMappingValue executeFunction(PlatformMappingValue.Key key) throws Exception {
@@ -155,6 +155,6 @@ private BuildConfigurationValue.Key keyForOptions(BuildOptions modifiedOptions)
     BuildOptions.OptionsDiffForReconstruction diff =
         BuildOptions.diffForReconstruction(DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS, modifiedOptions);
 
-    return BuildConfigurationValue.keyWithoutPlatformMapping(PLATFORM_FRAGMENT_CLASS, diff);
+    return BuildConfigurationValue.key(PLATFORM_FRAGMENT_CLASS, diff);
   }
 }

dataset/GitHub_Java/bazelbuild.bazel/src/test/java/com/google/devtools/build/lib/skyframe/PlatformMappingValueTest.java

@@ -24,7 +24,6 @@
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.CompilationMode;
-import com.google.devtools.build.lib.analysis.config.CoreOptions;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -46,7 +45,8 @@ public class PlatformMappingValueTest {
       ImmutableSet.of(PlatformConfiguration.class);
 
   private static final ImmutableList<Class<? extends FragmentOptions>>
-      BUILD_CONFIG_PLATFORM_OPTIONS = ImmutableList.of(CoreOptions.class, PlatformOptions.class);
+      BUILD_CONFIG_PLATFORM_OPTIONS =
+          ImmutableList.of(BuildConfiguration.Options.class, PlatformOptions.class);
 
   private static final Label PLATFORM1 = Label.parseAbsoluteUnchecked("//platforms:one");
   private static final Label PLATFORM2 = Label.parseAbsoluteUnchecked("//platforms:two");
@@ -65,7 +65,7 @@ public void testMapNoMappings() throws OptionsParsingException {
         new PlatformMappingValue(ImmutableMap.of(), ImmutableMap.of());
 
     BuildConfigurationValue.Key key =
-        BuildConfigurationValue.keyWithoutPlatformMapping(PLATFORM_FRAGMENT_CLASS, EMPTY_DIFF);
+        BuildConfigurationValue.key(PLATFORM_FRAGMENT_CLASS, EMPTY_DIFF);
 
     BuildConfigurationValue.Key mapped =
         mappingValue.map(key, DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS);
@@ -90,7 +90,7 @@ public void testMapPlatformToFlags() throws Exception {
 
     assertThat(mapped.getFragments()).isEqualTo(PLATFORM_FRAGMENT_CLASS);
 
-    assertThat(toMappedOptions(mapped).get(CoreOptions.class).cpu).isEqualTo("one");
+    assertThat(toMappedOptions(mapped).get(BuildConfiguration.Options.class).cpu).isEqualTo("one");
   }
 
   @Test
@@ -102,8 +102,8 @@ public void testMapFlagsToPlatform() throws Exception {
         new PlatformMappingValue(ImmutableMap.of(), flagsToPlatforms);
 
     BuildOptions modifiedOptions = DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS.clone();
-    modifiedOptions.get(CoreOptions.class).cpu = "one";
-    modifiedOptions.get(CoreOptions.class).compilationMode = CompilationMode.DBG;
+    modifiedOptions.get(BuildConfiguration.Options.class).cpu = "one";
+    modifiedOptions.get(BuildConfiguration.Options.class).compilationMode = CompilationMode.DBG;
 
     BuildConfigurationValue.Key mapped =
         mappingValue.map(keyForOptions(modifiedOptions), DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS);
@@ -125,7 +125,7 @@ public void testMapFlagsToPlatformPriority() throws Exception {
         new PlatformMappingValue(ImmutableMap.of(), flagsToPlatforms);
 
     BuildOptions modifiedOptions = DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS.clone();
-    modifiedOptions.get(CoreOptions.class).cpu = "foo";
+    modifiedOptions.get(BuildConfiguration.Options.class).cpu = "foo";
 
     BuildConfigurationValue.Key mapped =
         mappingValue.map(keyForOptions(modifiedOptions), DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS);
@@ -143,7 +143,7 @@ public void testMapFlagsToPlatformNoneMatching() throws Exception {
         new PlatformMappingValue(ImmutableMap.of(), flagsToPlatforms);
 
     BuildOptions modifiedOptions = DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS.clone();
-    modifiedOptions.get(CoreOptions.class).cpu = "bar";
+    modifiedOptions.get(BuildConfiguration.Options.class).cpu = "bar";
 
     BuildConfigurationValue.Key mapped =
         mappingValue.map(keyForOptions(modifiedOptions), DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS);
@@ -160,7 +160,7 @@ public void testMapNoPlatformOptions() throws Exception {
     PlatformMappingValue mappingValue =
         new PlatformMappingValue(ImmutableMap.of(), flagsToPlatforms);
 
-    BuildOptions options = BuildOptions.of(ImmutableList.of(CoreOptions.class));
+    BuildOptions options = BuildOptions.of(ImmutableList.of(BuildConfiguration.Options.class));
 
     assertThrows(
         IllegalArgumentException.class,
@@ -175,7 +175,7 @@ public void testMapNoMappingIfPlatformIsSetButNotMatching() throws Exception {
         ImmutableMap.of(ImmutableList.of("--cpu=one"), PLATFORM1);
 
     BuildOptions modifiedOptions = DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS.clone();
-    modifiedOptions.get(CoreOptions.class).cpu = "one";
+    modifiedOptions.get(BuildConfiguration.Options.class).cpu = "one";
     modifiedOptions.get(PlatformOptions.class).platforms = ImmutableList.of(PLATFORM2);
 
     PlatformMappingValue mappingValue =
@@ -193,7 +193,7 @@ public void testMapNoMappingIfPlatformIsSetAndNoPlatformMapping() throws Excepti
         ImmutableMap.of(ImmutableList.of("--cpu=one"), PLATFORM1);
 
     BuildOptions modifiedOptions = DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS.clone();
-    modifiedOptions.get(CoreOptions.class).cpu = "one";
+    modifiedOptions.get(BuildConfiguration.Options.class).cpu = "one";
     modifiedOptions.get(PlatformOptions.class).platforms = ImmutableList.of(PLATFORM2);
 
     PlatformMappingValue mappingValue =
@@ -238,6 +238,6 @@ private BuildConfigurationValue.Key keyForOptions(BuildOptions modifiedOptions)
     BuildOptions.OptionsDiffForReconstruction diff =
         BuildOptions.diffForReconstruction(DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS, modifiedOptions);
 
-    return BuildConfigurationValue.keyWithoutPlatformMapping(PLATFORM_FRAGMENT_CLASS, diff);
+    return BuildConfigurationValue.key(PLATFORM_FRAGMENT_CLASS, diff);
   }
 }