Add RuleContext#getPrerequisiteConfiguredTargetAndTarget and use it in GoTest to avoid calling ConfiguredTarget#getConfiguration.
PiperOrigin-RevId: 188623273
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 ab0bb5e..1ae3246 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
@@ -375,10 +375,6 @@
return Multimaps.transformValues(targetMap, ConfiguredTargetAndData::getConfiguredTarget);
}
- private List<? extends TransitiveInfoCollection> getDeps(String key) {
- return Lists.transform(targetMap.get(key), ConfiguredTargetAndData::getConfiguredTarget);
- }
-
private List<ConfiguredTargetAndData> getConfiguredTargetAndTargetDeps(String key) {
return targetMap.get(key);
}
@@ -852,8 +848,19 @@
* assertion will be raised. Returns null if the attribute is empty.
*/
public TransitiveInfoCollection getPrerequisite(String attributeName, Mode mode) {
+ ConfiguredTargetAndData result = getPrerequisiteConfiguredTargetAndData(attributeName, mode);
+ return result == null ? null : result.getConfiguredTarget();
+ }
+
+ /**
+ * Returns the {@link ConfiguredTargetAndData} that feeds ino this target through the specified
+ * attribute. Note that you need to specify the correct mode for the attribute, otherwise an
+ * assertion will be raised. Returns null if the attribute is empty.
+ */
+ public ConfiguredTargetAndData getPrerequisiteConfiguredTargetAndData(
+ String attributeName, Mode mode) {
checkAttribute(attributeName, mode);
- List<? extends TransitiveInfoCollection> elements = getDeps(attributeName);
+ List<ConfiguredTargetAndData> elements = getConfiguredTargetAndTargetDeps(attributeName);
if (elements.size() > 1) {
throw new IllegalStateException(getRuleClassNameForLogging() + " attribute " + attributeName
+ " produces more than one prerequisite");
