commit c0e7d04f36f8487e7f0b6a1d61290ff917bcce11
author Googler <shahan@google.com> Wed May 03 10:23:04 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Wed May 03 10:24:26 2023 -0700
tree 780a0dff426f0dae81c2135987033a90fe824080
parent c73d4aa20ebda7198320edc06d3fbcdfd63abadd

Add ProxyConfiguredTargetKey.

This key creates a layer of indirection between ConfiguredTargetKey and
ConfiguredTargetValue. It will be used to deduplicate convergent keys
once Rule transitions are moved from the dependency resolver to the top
of the ConfiguredTargetFunction.

PiperOrigin-RevId: 529127498
Change-Id: I73212ccc9ed4887ac0021384fabe646eb2174e35

src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java
index 2298a07..402dc95 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java
@@ -17,6 +17,7 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Interner;
 import com.google.devtools.build.lib.actions.ActionLookupKey;
+import com.google.devtools.build.lib.actions.ActionLookupKeyOrProxy;
 import com.google.devtools.build.lib.actions.Actions.GeneratingActions;
 import com.google.devtools.build.lib.actions.BasicActionLookupValue;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -30,27 +31,29 @@
     super(generatingActions);
   }
 
-  public static ActionTemplateExpansionKey key(ActionLookupKey actionLookupKey, int actionIndex) {
+  public static ActionTemplateExpansionKey key(
+      ActionLookupKeyOrProxy actionLookupKey, int actionIndex) {
     return ActionTemplateExpansionKey.of(actionLookupKey, actionIndex);
   }
 
   /** Key for {@link ActionTemplateExpansionValue} nodes. */
   @AutoCodec
-  public static final class ActionTemplateExpansionKey extends ActionLookupKey {
+  public static final class ActionTemplateExpansionKey implements ActionLookupKey {
     private static final Interner<ActionTemplateExpansionKey> interner =
         BlazeInterners.newWeakInterner();
 
-    private final ActionLookupKey actionLookupKey;
+    private final ActionLookupKeyOrProxy actionLookupKey;
     private final int actionIndex;
 
-    private ActionTemplateExpansionKey(ActionLookupKey actionLookupKey, int actionIndex) {
+    private ActionTemplateExpansionKey(ActionLookupKeyOrProxy actionLookupKey, int actionIndex) {
       this.actionLookupKey = actionLookupKey;
       this.actionIndex = actionIndex;
     }
 
     @VisibleForTesting
     @AutoCodec.Instantiator
-    public static ActionTemplateExpansionKey of(ActionLookupKey actionLookupKey, int actionIndex) {
+    public static ActionTemplateExpansionKey of(
+        ActionLookupKeyOrProxy actionLookupKey, int actionIndex) {
       return interner.intern(new ActionTemplateExpansionKey(actionLookupKey, actionIndex));
     }
 
@@ -69,7 +72,7 @@
       return actionLookupKey.getConfigurationKey();
     }
 
-    public ActionLookupKey getActionLookupKey() {
+    public ActionLookupKeyOrProxy getActionLookupKey() {
       return actionLookupKey;
     }