Add check that NativeAndStarlarkFlags actually contains flags.

Part of fixing bazelbuild#23147. Closes bazelbuild#23157. PiperOrigin-RevId: 658001205 Change-Id: Ibf85095d66f70ebcf078bd7f6da108bab37746f1
katre · Jul 31, 2024 · 5a8280a · 5a8280a
1 parent d2eeed4
commit 5a8280a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.../java/com/google/devtools/build/lib/analysis/producers/BuildConfigurationKeyProducer.java b/.../java/com/google/devtools/build/lib/analysis/producers/BuildConfigurationKeyProducer.java
@@ -201,7 +201,7 @@ private StateMachine finishConfigurationKeyProcessing(BuildConfigurationKey newC
   private BuildConfigurationKey applyFlagsForOptions(BuildOptions options)
       throws OptionsParsingException {
     // Does the target platform provide any flags?
-    if (this.platformFlags != null) {
+    if (this.platformFlags != null && !this.platformFlags.isEmpty()) {
       OptionsParsingResult parsingResult = platformFlags.parse();
       BuildOptions updatedOptions = options.applyParsingResult(parsingResult);
       return BuildConfigurationKey.create(updatedOptions);

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/config/NativeAndStarlarkFlags.java b/src/main/java/com/google/devtools/build/lib/skyframe/config/NativeAndStarlarkFlags.java
@@ -64,6 +64,10 @@ public static Builder builder() {
   @Nullable
   abstract RepositoryMapping repoMapping();
 
+  public boolean isEmpty() {
+    return nativeFlags().isEmpty() && starlarkFlags().isEmpty();
+  }
+
   public OptionsParsingResult parse() throws OptionsParsingException {
     OptionsParser parser =
         OptionsParser.builder()