commit 928e0fe3374e5bf7d47624eb35413539ec99d67e
author Googler <kotlaja@google.com> Wed Jan 18 02:31:45 2023 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Jan 18 02:33:01 2023 -0800
tree d6a56b852076ab35e855a750cf03b5fe11334cbc
parent 130b444d4b23a446a8851866da874b964ec5f98e

Get toolchain context and toolchain info from automatic exec groups if needed

Before this, toolchain context returned context from the default exec group, which is invalid once the AEG are implemented (https://docs.google.com/document/d/1-rbP_hmKs9D639YWw5F_JyxPxL2bi6dSmmvj_WXak9M).

I've added getToolchainContext(toolchainType) and getToolchainInfo(toolchainType) functions which cover automatic exec groups.

PiperOrigin-RevId: 502816645
Change-Id: Ife34f97700c28b0a1a64f2663e1a8182de5ca44c

src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index 2488fda..c6e25ad 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -53,6 +53,7 @@
 import com.google.devtools.build.lib.analysis.config.Fragment;
 import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo;
 import com.google.devtools.build.lib.analysis.platform.PlatformInfo;
+import com.google.devtools.build.lib.analysis.platform.ToolchainInfo;
 import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext;
 import com.google.devtools.build.lib.analysis.stringtemplate.TemplateContext;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -1216,6 +1217,10 @@
     }
   }
 
+  /**
+   * Returns the toolchain context from the default exec group. Important note: In case automatic
+   * exec groups are enabled, use `getToolchainContext(Label toolchainType)` function.
+   */
   @Nullable
   public ResolvedToolchainContext getToolchainContext() {
     return toolchainContexts == null ? null : toolchainContexts.getDefaultToolchainContext();
@@ -1226,6 +1231,22 @@
     return toolchainContexts == null ? null : toolchainContexts.getToolchainContext(execGroup);
   }
 
+  /**
+   * Returns the toolchain info from the default exec group in case automatic exec groups are not
+   * enabled. If they are enabled, retrieves toolchain info from the corresponding automatic exec
+   * group.
+   */
+  @Nullable
+  public ToolchainInfo getToolchainInfo(Label toolchainType) {
+    ResolvedToolchainContext toolchainContext;
+    if (useAutoExecGroups()) {
+      toolchainContext = toolchainContexts.getToolchainContext(toolchainType.toString());
+    } else {
+      toolchainContext = getToolchainContext();
+    }
+    return toolchainContext == null ? null : toolchainContext.forToolchainType(toolchainType);
+  }
+
   public boolean hasToolchainContext(String execGroup) {
     return toolchainContexts != null && toolchainContexts.hasToolchainContext(execGroup);
   }