Transformation for build configurations based on a platform/flags mapping.

    Introduces a new SkyValue which stores the information obtained from a mapping file (parser yet to be written) and provides logic to transform a build configuration (key) based on that.

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

    RELNOTES: None.
    PiperOrigin-RevId: 238298127

Author: Luca Di Grazia

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

@@ -16,9 +16,9 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+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.ConfigurationFragmentFactory;
-import com.google.devtools.build.lib.analysis.config.Fragment;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
 
@@ -33,17 +33,16 @@ public ImmutableSet<Class<? extends FragmentOptions>> requiredOptions() {
   public PlatformConfiguration create(BuildOptions buildOptions)
       throws InvalidConfigurationException {
     PlatformOptions platformOptions = buildOptions.get(PlatformOptions.class);
-
     return new PlatformConfiguration(
         platformOptions.computeHostPlatform(),
         ImmutableList.copyOf(platformOptions.extraExecutionPlatforms),
         platformOptions.computeTargetPlatform(),
         ImmutableList.copyOf(platformOptions.extraToolchains),
-        platformOptions.targetFilterToAdditionalExecConstraints);
+        ImmutableList.copyOf(platformOptions.enabledToolchainTypes));
   }
 
   @Override
-  public Class<? extends Fragment> creates() {
+  public Class<? extends BuildConfiguration.Fragment> creates() {
     return PlatformConfiguration.class;
   }
 }

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

@@ -20,8 +20,6 @@
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.LabelListConverter;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.util.OptionsUtils;
-import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.common.options.Converters.CommaSeparatedOptionListConverter;
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionDocumentationCategory;
@@ -41,13 +39,6 @@ public class PlatformOptions extends FragmentOptions {
   public static final Label LEGACY_DEFAULT_TARGET_PLATFORM =
       Label.parseAbsoluteUnchecked("@bazel_tools//platforms:target_platform");
 
-  /**
-   * Main workspace-relative location to use when the user does not explicitly set {@code
-   * --platform_mappings}.
-   */
-  public static final PathFragment DEFAULT_PLATFORM_MAPPINGS =
-      PathFragment.create("platform_mappings");
-
   @Option(
       name = "host_platform",
       oldName = "experimental_host_platform",
@@ -178,23 +169,6 @@ public class PlatformOptions extends FragmentOptions {
               + " java_runtime.")
   public boolean useToolchainResolutionForJavaRules;
 
-  @Option(
-      name = "platform_mappings",
-      converter = OptionsUtils.EmptyToNullRelativePathFragmentConverter.class,
-      defaultValue = "",
-      documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
-      effectTags = {
-        OptionEffectTag.AFFECTS_OUTPUTS,
-        OptionEffectTag.CHANGES_INPUTS,
-        OptionEffectTag.LOADING_AND_ANALYSIS
-      },
-      help =
-          "The location of a mapping file that describes which platform to use if none is set or "
-              + "which flags to set when a platform already exists. Must be relative to the main "
-              + "workspace root. Defaults to 'platform_mappings' (a file directly under the "
-              + "workspace root).")
-  public PathFragment platformMappings;
-
   @Override
   public PlatformOptions getHost() {
     PlatformOptions host = (PlatformOptions) getDefault();

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

@@ -332,8 +332,10 @@ public BuildOptions applyDiff(OptionsDiffForReconstruction optionsDiff) {
    *
    * @param parsingResult any options that are being modified
    * @return the new options after applying the parsing result to the original options
+   * @throws OptionsParsingException if a value in the parsing result cannot in fact be parsed
    */
-  public BuildOptions applyParsingResult(OptionsParsingResult parsingResult) {
+  public BuildOptions applyParsingResult(OptionsParsingResult parsingResult)
+      throws OptionsParsingException {
     Map<Class<? extends FragmentOptions>, FragmentOptions> modifiedFragments =
         toModifiedFragments(parsingResult);
 
@@ -359,7 +361,7 @@ public BuildOptions applyParsingResult(OptionsParsingResult parsingResult) {
   }
 
   private Map<Class<? extends FragmentOptions>, FragmentOptions> toModifiedFragments(
-      OptionsParsingResult parsingResult) {
+      OptionsParsingResult parsingResult) throws OptionsParsingException {
     Map<Class<? extends FragmentOptions>, FragmentOptions> replacedOptions = new HashMap<>();
     for (ParsedOptionDescription parsedOption : parsingResult.asListOfExplicitOptions()) {
       OptionDefinition optionDefinition = parsedOption.getOptionDefinition();
@@ -380,9 +382,7 @@ private Map<Class<? extends FragmentOptions>, FragmentOptions> toModifiedFragmen
               fragmentOptionClass,
               (Class<? extends FragmentOptions> k) -> originalFragment.clone());
       try {
-        Object value =
-            parsingResult.getOptionValueDescription(optionDefinition.getOptionName()).getValue();
-        optionDefinition.getField().set(newOptions, value);
+        optionDefinition.getField().set(newOptions, parsedOption.getConvertedValue());
       } catch (IllegalAccessException e) {
         throw new IllegalStateException("Couldn't set " + optionDefinition.getField(), e);
       }
@@ -471,14 +471,11 @@ public Builder merge(BuildOptions options) {
     }
 
     /**
-     * Adds a new {@link FragmentOptions} instance to the builder.
-     *
-     * <p>Overrides previous instances of the exact same subclass of {@code FragmentOptions}.
-     *
-     * <p>The options get preprocessed with {@link FragmentOptions#getNormalized}.
+     * Adds a new FragmentOptions instance to the builder. Overrides previous instances of the exact
+     * same subclass of FragmentOptions.
      */
     public <T extends FragmentOptions> Builder addFragmentOptions(T options) {
-      fragmentOptions.put(options.getClass(), options.getNormalized());
+      fragmentOptions.put(options.getClass(), options);
       return this;
     }
 

dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skyframe/PlatformMappingValue.java

@@ -16,7 +16,6 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Interner;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.analysis.PlatformOptions;
@@ -25,7 +24,7 @@
 import com.google.devtools.build.lib.concurrent.BlazeInterners;
 import com.google.devtools.build.lib.concurrent.ThreadSafety;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-import com.google.devtools.build.lib.vfs.PathFragment;
+import com.google.devtools.build.lib.vfs.RootedPath;
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
@@ -36,7 +35,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import javax.annotation.Nullable;
 
 /**
  * Stores contents of a platforms/flags mapping file for transforming one {@link
@@ -48,54 +46,22 @@
  */
 public final class PlatformMappingValue implements SkyValue {
 
-  public static final PlatformMappingValue EMPTY =
-      new PlatformMappingValue(ImmutableMap.of(), ImmutableMap.of());
-
   /** Key for {@link PlatformMappingValue} based on the location of the mapping file. */
   @ThreadSafety.Immutable
   @AutoCodec
   public static final class Key implements SkyKey {
     private static final Interner<Key> interner = BlazeInterners.newWeakInterner();
 
-    /**
-     * Creates a new platform mappings key with the given, main workspace-relative path to the
-     * mappings file, typically derived from the {@code --platform_mappings} flag.
-     *
-     * <p>If the path is {@code null} the {@link PlatformOptions#DEFAULT_PLATFORM_MAPPINGS default
-     * path} will be used and the key marked as not having been set by a user.
-     *
-     * @param workspaceRelativeMappingPath main workspace relative path to the mappings file or
-     *     {@code null} if the default location should be used
-     */
-    public static Key create(@Nullable PathFragment workspaceRelativeMappingPath) {
-      if (workspaceRelativeMappingPath == null) {
-        return create(PlatformOptions.DEFAULT_PLATFORM_MAPPINGS, false);
-      } else {
-        return create(workspaceRelativeMappingPath, true);
-      }
-    }
-
-    @AutoCodec.Instantiator
-    @AutoCodec.VisibleForSerialization
-    static Key create(PathFragment workspaceRelativeMappingPath, boolean wasExplicitlySetByUser) {
-      return interner.intern(new Key(workspaceRelativeMappingPath, wasExplicitlySetByUser));
-    }
-
-    private final PathFragment path;
-    private final boolean wasExplicitlySetByUser;
+    private final RootedPath path;
 
-    private Key(PathFragment path, boolean wasExplicitlySetByUser) {
+    private Key(RootedPath path) {
       this.path = path;
-      this.wasExplicitlySetByUser = wasExplicitlySetByUser;
-    }
-
-    /** Returns the main-workspace relative path this mapping's mapping file can be found at. */
-    public PathFragment getWorkspaceRelativeMappingPath() {
-      return path;
     }
 
-    public boolean wasExplicitlySetByUser() {
-      return wasExplicitlySetByUser;
+    @AutoCodec.VisibleForSerialization
+    @AutoCodec.Instantiator
+    static Key create(RootedPath path) {
+      return interner.intern(new Key(path));
     }
 
     @Override
@@ -112,21 +78,17 @@ public boolean equals(Object o) {
         return false;
       }
       Key key = (Key) o;
-      return Objects.equals(path, key.path) && wasExplicitlySetByUser == key.wasExplicitlySetByUser;
+      return Objects.equals(path, key.path);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(path, wasExplicitlySetByUser);
+      return Objects.hash(path);
     }
 
     @Override
     public String toString() {
-      return "PlatformMappingValue.Key{path="
-          + path
-          + ", wasExplicitlySetByUser="
-          + wasExplicitlySetByUser
-          + "}";
+      return "PlatformMappingValue.Key{" + "path=" + path + '}';
     }
   }
 

dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java

@@ -118,7 +118,7 @@ public final class SkyFunctions {
   public static final SkyFunctionName BUILD_INFO = SkyFunctionName.createHermetic("BUILD_INFO");
   public static final SkyFunctionName WORKSPACE_NAME =
       SkyFunctionName.createHermetic("WORKSPACE_NAME");
-  public static final SkyFunctionName PLATFORM_MAPPING =
+  static final SkyFunctionName PLATFORM_MAPPING =
       SkyFunctionName.createHermetic("PLATFORM_MAPPING");
   static final SkyFunctionName COVERAGE_REPORT = SkyFunctionName.createHermetic("COVERAGE_REPORT");
   public static final SkyFunctionName REPOSITORY = SkyFunctionName.createHermetic("REPOSITORY");

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

@@ -27,7 +27,6 @@
 import com.google.devtools.build.lib.analysis.config.CompilationMode;
 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;
 import com.google.devtools.common.options.OptionsParsingException;
 import java.util.Collection;
 import java.util.Set;
@@ -204,23 +203,6 @@ public void testMapNoMappingIfPlatformIsSetAndNoPlatformMapping() throws Excepti
     assertThat(keyForOptions(modifiedOptions)).isEqualTo(mapped);
   }
 
-  @Test
-  public void testDefaultKey() {
-    PlatformMappingValue.Key key = PlatformMappingValue.Key.create(null);
-
-    assertThat(key.getWorkspaceRelativeMappingPath())
-        .isEqualTo(PlatformOptions.DEFAULT_PLATFORM_MAPPINGS);
-    assertThat(key.wasExplicitlySetByUser()).isFalse();
-  }
-
-  @Test
-  public void testCustomKey() {
-    PlatformMappingValue.Key key = PlatformMappingValue.Key.create(PathFragment.create("my/path"));
-
-    assertThat(key.getWorkspaceRelativeMappingPath()).isEqualTo(PathFragment.create("my/path"));
-    assertThat(key.wasExplicitlySetByUser()).isTrue();
-  }
-
   private BuildOptions toMappedOptions(BuildConfigurationValue.Key mapped) {
     return DEFAULT_BUILD_CONFIG_PLATFORM_OPTIONS.applyDiff(mapped.getOptionsDiff());
   }