Rename UnloadedToolchainContextKey to ToolchainContextKey.

Cleanup leading to toolchain transitions, bazelbuild#10523.

src/main/java/com/google/devtools/build/lib/query2/BUILD

@@ -81,10 +81,10 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/skyframe:sky_functions",
         "//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
         "//src/main/java/com/google/devtools/build/lib/skyframe:target_pattern_value",
+        "//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_context_key",
         "//src/main/java/com/google/devtools/build/lib/skyframe:transitive_traversal_value",
         "//src/main/java/com/google/devtools/build/lib/skyframe:traversal_info_root_package_extractor",
         "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context",
-        "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context_key",
         "//src/main/java/com/google/devtools/build/lib/skyframe:workspace_name_value",
         "//src/main/java/com/google/devtools/build/lib/supplier",
         "//src/main/java/com/google/devtools/build/lib/util",

src/main/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetAccessor.java

@@ -44,8 +44,8 @@
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetValue;
 import com.google.devtools.build.lib.skyframe.PackageValue;
+import com.google.devtools.build.lib.skyframe.ToolchainContextKey;
 import com.google.devtools.build.lib.skyframe.UnloadedToolchainContext;
-import com.google.devtools.build.lib.skyframe.UnloadedToolchainContextKey;
 import com.google.devtools.build.skyframe.WalkableGraph;
 import java.util.List;
 import java.util.Map;
@@ -229,7 +229,7 @@ private static ToolchainCollection<ToolchainContext> getToolchainContexts(
         UnloadedToolchainContext context =
             (UnloadedToolchainContext)
                 walkableGraph.getValue(
-                    UnloadedToolchainContextKey.key()
+                    ToolchainContextKey.key()
                         .configurationKey(BuildConfigurationValue.key(config))
                         .requiredToolchainTypeLabels(execGroup.getRequiredToolchains())
                         .execConstraintLabels(execGroup.getExecutionPlatformConstraints())
@@ -242,7 +242,7 @@ private static ToolchainCollection<ToolchainContext> getToolchainContexts(
       UnloadedToolchainContext defaultContext =
           (UnloadedToolchainContext)
               walkableGraph.getValue(
-                  UnloadedToolchainContextKey.key()
+                  ToolchainContextKey.key()
                       .configurationKey(BuildConfigurationValue.key(config))
                       .requiredToolchainTypeLabels(requiredToolchains)
                       .execConstraintLabels(execConstraintLabels)

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

@@ -394,7 +394,7 @@ public SkyValue compute(SkyKey skyKey, Environment env)
           unloadedToolchainContext =
               (UnloadedToolchainContext)
                   env.getValueOrThrow(
-                      UnloadedToolchainContextKey.key()
+                      ToolchainContextKey.key()
                           .configurationKey(BuildConfigurationValue.key(configuration))
                           .requiredToolchainTypeLabels(requiredToolchains)
                           .shouldSanityCheckConfiguration(

src/main/java/com/google/devtools/build/lib/skyframe/BUILD

@@ -207,6 +207,7 @@ java_library(
         ":test_expansion_function",
         ":tests_for_target_pattern_function",
         ":tests_for_target_pattern_value",
+        ":toolchain_context_key",
         ":toolchain_exception",
         ":top_down_action_cache",
         ":transitive_base_traversal_function",
@@ -217,7 +218,6 @@ java_library(
         ":transitive_traversal_value",
         ":tree_artifact_value",
         ":unloaded_toolchain_context",
-        ":unloaded_toolchain_context_key",
         ":workspace_ast_value",
         ":workspace_name_function",
         ":workspace_name_value",
@@ -2637,8 +2637,8 @@ java_library(
 )
 
 java_library(
-    name = "unloaded_toolchain_context_key",
-    srcs = ["UnloadedToolchainContextKey.java"],
+    name = "toolchain_context_key",
+    srcs = ["ToolchainContextKey.java"],
     deps = [
         ":build_configuration_value",
         ":sky_functions",

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

@@ -485,11 +485,11 @@ private ToolchainCollection<UnloadedToolchainContext> computeUnloadedToolchainCo
             configuration.getFragmentsMap().keySet(),
             BuildOptions.diffForReconstruction(defaultBuildOptions, toolchainOptions));
 
-    Map<String, UnloadedToolchainContextKey> unloadedToolchainContextKeys = new HashMap<>();
+    Map<String, ToolchainContextKey> unloadedToolchainContextKeys = new HashMap<>();
     String targetUnloadedToolchainContext = "target-unloaded-toolchain-context";
     unloadedToolchainContextKeys.put(
         targetUnloadedToolchainContext,
-        UnloadedToolchainContextKey.key()
+        ToolchainContextKey.key()
             .configurationKey(toolchainConfig)
             .requiredToolchainTypeLabels(requiredDefaultToolchains)
             .execConstraintLabels(defaultExecConstraintLabels)
@@ -499,7 +499,7 @@ private ToolchainCollection<UnloadedToolchainContext> computeUnloadedToolchainCo
       ExecGroup execGroup = group.getValue();
       unloadedToolchainContextKeys.put(
           group.getKey(),
-          UnloadedToolchainContextKey.key()
+          ToolchainContextKey.key()
               .configurationKey(toolchainConfig)
               .requiredToolchainTypeLabels(execGroup.getRequiredToolchains())
               .execConstraintLabels(execGroup.getExecutionPlatformConstraints())
@@ -514,7 +514,7 @@ private ToolchainCollection<UnloadedToolchainContext> computeUnloadedToolchainCo
 
     ToolchainCollection.Builder<UnloadedToolchainContext> toolchainContexts =
         valuesMissing ? null : new ToolchainCollection.Builder<>();
-    for (Map.Entry<String, UnloadedToolchainContextKey> unloadedToolchainContextKey :
+    for (Map.Entry<String, ToolchainContextKey> unloadedToolchainContextKey :
         unloadedToolchainContextKeys.entrySet()) {
       UnloadedToolchainContext unloadedToolchainContext =
           (UnloadedToolchainContext) values.get(unloadedToolchainContextKey.getValue()).get();

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

@@ -88,9 +88,9 @@ public boolean maybeReportCycle(
                 ((SingleToolchainResolutionKey) input.argument()).toolchainTypeLabel();
             return String.format("toolchain type %s", toolchainType);
           }
-          if (input.argument() instanceof UnloadedToolchainContextKey) {
+          if (input.argument() instanceof ToolchainContextKey) {
             ImmutableSet<Label> toolchainTypes =
-                ((UnloadedToolchainContextKey) input.argument()).requiredToolchainTypeLabels();
+                ((ToolchainContextKey) input.argument()).requiredToolchainTypeLabels();
             return String.format(
                 "toolchain types %s",
                 toolchainTypes.stream().map(Label::toString).collect(joining(", ")));

src/main/java/com/google/devtools/build/lib/skyframe/UnloadedToolchainContextKey.java → src/main/java/com/google/devtools/build/lib/skyframe/ToolchainContextKey.java

@@ -24,7 +24,7 @@
  * UnloadedToolchainContextImpl} instances.
  */
 @AutoValue
-public abstract class UnloadedToolchainContextKey implements SkyKey {
+public abstract class ToolchainContextKey implements SkyKey {
 
   /** Returns a new {@link Builder}. */
   public static Builder key() {
@@ -47,7 +47,7 @@ public SkyFunctionName functionName() {
 
   abstract boolean shouldSanityCheckConfiguration();
 
-  /** Builder for {@link UnloadedToolchainContextKey}. */
+  /** Builder for {@link ToolchainContextKey}. */
   @AutoValue.Builder
   public interface Builder {
     Builder configurationKey(BuildConfigurationValue.Key key);
@@ -62,6 +62,6 @@ public interface Builder {
 
     Builder shouldSanityCheckConfiguration(boolean shouldSanityCheckConfiguration);
 
-    UnloadedToolchainContextKey build();
+    ToolchainContextKey build();
   }
 }

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

@@ -62,7 +62,7 @@ public class ToolchainResolutionFunction implements SkyFunction {
   @Override
   public UnloadedToolchainContext compute(SkyKey skyKey, Environment env)
       throws ToolchainResolutionFunctionException, InterruptedException {
-    UnloadedToolchainContextKey key = (UnloadedToolchainContextKey) skyKey.argument();
+    ToolchainContextKey key = (ToolchainContextKey) skyKey.argument();
 
     try {
       UnloadedToolchainContextImpl.Builder builder = UnloadedToolchainContextImpl.builder();

src/test/java/com/google/devtools/build/lib/analysis/BUILD

@@ -122,6 +122,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_and_data",
         "//src/main/java/com/google/devtools/build/lib/skyframe:configured_target_key",
         "//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
+        "//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_context_key",
         "//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_exception",
         "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",

src/test/java/com/google/devtools/build/lib/analysis/util/BUILD

@@ -104,9 +104,9 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/skyframe:sky_functions",
         "//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
         "//src/main/java/com/google/devtools/build/lib/skyframe:target_pattern_phase_value",
+        "//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_context_key",
         "//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_exception",
         "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context",
-        "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context_key",
         "//src/main/java/com/google/devtools/build/lib/skyframe/packages:PackageFactoryBuilderWithSkyframeForTesting",
         "//src/main/java/com/google/devtools/build/lib/util",
         "//src/main/java/com/google/devtools/build/lib/util:filetype",

src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java

@@ -84,9 +84,9 @@
 import com.google.devtools.build.lib.skyframe.SkyframeBuildView;
 import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
 import com.google.devtools.build.lib.skyframe.TargetPatternPhaseValue;
+import com.google.devtools.build.lib.skyframe.ToolchainContextKey;
 import com.google.devtools.build.lib.skyframe.ToolchainException;
 import com.google.devtools.build.lib.skyframe.UnloadedToolchainContext;
-import com.google.devtools.build.lib.skyframe.UnloadedToolchainContextKey;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.util.OrderedSetMultimap;
 import com.google.devtools.build.skyframe.SkyKey;
@@ -501,19 +501,19 @@ public RuleContext getRuleContextForTesting(
     SkyFunctionEnvironmentForTesting skyfunctionEnvironment =
         skyframeExecutor.getSkyFunctionEnvironmentForTesting(eventHandler);
 
-    Map<String, UnloadedToolchainContextKey> unloadedToolchainContextKeys = new HashMap<>();
+    Map<String, ToolchainContextKey> unloadedToolchainContextKeys = new HashMap<>();
     for (Map.Entry<String, ExecGroup> execGroup : execGroups.entrySet()) {
       unloadedToolchainContextKeys.put(
           execGroup.getKey(),
-          UnloadedToolchainContextKey.key()
+          ToolchainContextKey.key()
               .configurationKey(BuildConfigurationValue.key(targetConfig))
               .requiredToolchainTypeLabels(execGroup.getValue().getRequiredToolchains())
               .build());
     }
     String targetUnloadedToolchainContextKey = "target-unloaded-toolchain-context";
     unloadedToolchainContextKeys.put(
         targetUnloadedToolchainContextKey,
-        UnloadedToolchainContextKey.key()
+        ToolchainContextKey.key()
             .configurationKey(BuildConfigurationValue.key(targetConfig))
             .requiredToolchainTypeLabels(requiredToolchains)
             .build());
@@ -524,7 +524,7 @@ public RuleContext getRuleContextForTesting(
 
     ToolchainCollection.Builder<UnloadedToolchainContext> unloadedToolchainContexts =
         new ToolchainCollection.Builder<>();
-    for (Map.Entry<String, UnloadedToolchainContextKey> unloadedToolchainContextKey :
+    for (Map.Entry<String, ToolchainContextKey> unloadedToolchainContextKey :
         unloadedToolchainContextKeys.entrySet()) {
       UnloadedToolchainContext unloadedToolchainContext =
           (UnloadedToolchainContext) values.get(unloadedToolchainContextKey.getValue()).get();

src/test/java/com/google/devtools/build/lib/skyframe/BUILD

@@ -225,7 +225,7 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib/skyframe:transitive_traversal_value",
         "//src/main/java/com/google/devtools/build/lib/skyframe:tree_artifact_value",
         "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context",
-        "//src/main/java/com/google/devtools/build/lib/skyframe:unloaded_toolchain_context_key",
+        "//src/main/java/com/google/devtools/build/lib/skyframe:toolchain_context_key",
         "//src/main/java/com/google/devtools/build/lib/skyframe:workspace_ast_value",
         "//src/main/java/com/google/devtools/build/lib/skyframe:workspace_name_value",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",

src/test/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunctionTest.java

@@ -66,8 +66,8 @@ public void resolve() throws Exception {
         "register_execution_platforms('//platforms:mac', '//platforms:linux')");
 
     useConfiguration("--platforms=//platforms:linux");
-    UnloadedToolchainContextKey key =
-        UnloadedToolchainContextKey.key()
+    ToolchainContextKey key =
+        ToolchainContextKey.key()
             .configurationKey(targetConfigKey)
             .requiredToolchainTypeLabels(testToolchainTypeLabel)
             .build();
@@ -110,8 +110,8 @@ public void resolve_toolchainTypeAlias() throws Exception {
         "alias/BUILD", "alias(name = 'toolchain_type', actual = '//toolchain:test_toolchain')");
 
     useConfiguration("--platforms=//platforms:linux");
-    UnloadedToolchainContextKey key =
-        UnloadedToolchainContextKey.key()
+    ToolchainContextKey key =
+        ToolchainContextKey.key()
             .configurationKey(targetConfigKey)
             .requiredToolchainTypeLabels(aliasedToolchainTypeLabel)
             .build();
@@ -142,8 +142,7 @@ public void resolve_noToolchainType() throws Exception {
     rewriteWorkspace("register_execution_platforms('//platforms:mac', '//platforms:linux')");
 
     useConfiguration("--host_platform=//host:host", "--platforms=//platforms:linux");
-    UnloadedToolchainContextKey key =
-        UnloadedToolchainContextKey.key().configurationKey(targetConfigKey).build();
+    ToolchainContextKey key = ToolchainContextKey.key().configurationKey(targetConfigKey).build();
 
     EvaluationResult<UnloadedToolchainContext> result = invokeToolchainResolution(key);
 
@@ -178,8 +177,8 @@ public void resolve_noToolchainType_hostNotAvailable() throws Exception {
         "    '//sample:sample_a', '//sample:sample_b')");
 
     useConfiguration("--host_platform=//host:host", "--platforms=//platforms:linux");
-    UnloadedToolchainContextKey key =
-        UnloadedToolchainContextKey.key()
+    ToolchainContextKey key =
+        ToolchainContextKey.key()
             .configurationKey(targetConfigKey)
             .execConstraintLabels(Label.parseAbsoluteUnchecked("//sample:demo_b"))
             .build();
@@ -205,8 +204,8 @@ public void resolve_noToolchainType_hostNotAvailable() throws Exception {
   public void resolve_unavailableToolchainType_single() throws Exception {
     scratch.file("fake/toolchain/BUILD", "");
     useConfiguration("--host_platform=//platforms:linux", "--platforms=//platforms:mac");
-    UnloadedToolchainContextKey key =
-        UnloadedToolchainContextKey.key()
+    ToolchainContextKey key =
+        ToolchainContextKey.key()
             .configurationKey(targetConfigKey)
             .requiredToolchainTypeLabels(
                 testToolchainTypeLabel, Label.parseAbsoluteUnchecked("//fake/toolchain:type_1"))
@@ -229,8 +228,8 @@ public void resolve_unavailableToolchainType_single() throws Exception {
   public void resolve_unavailableToolchainType_multiple() throws Exception {
     scratch.file("fake/toolchain/BUILD", "");
     useConfiguration("--host_platform=//platforms:linux", "--platforms=//platforms:mac");
-    UnloadedToolchainContextKey key =
-        UnloadedToolchainContextKey.key()
+    ToolchainContextKey key =
+        ToolchainContextKey.key()
             .configurationKey(targetConfigKey)
             .requiredToolchainTypeLabels(
                 testToolchainTypeLabel,
@@ -251,8 +250,8 @@ public void resolve_unavailableToolchainType_multiple() throws Exception {
   public void resolve_invalidTargetPlatform_badTarget() throws Exception {
     scratch.file("invalid/BUILD", "filegroup(name = 'not_a_platform')");
     useConfiguration("--platforms=//invalid:not_a_platform");
-    UnloadedToolchainContextKey key =
-        UnloadedToolchainContextKey.key()
+    ToolchainContextKey key =
+        ToolchainContextKey.key()
             .configurationKey(targetConfigKey)
             .requiredToolchainTypeLabels(testToolchainTypeLabel)
             .build();
@@ -277,8 +276,8 @@ public void resolve_invalidTargetPlatform_badTarget() throws Exception {
   public void resolve_invalidTargetPlatform_badPackage() throws Exception {
     scratch.resolve("invalid").delete();
     useConfiguration("--platforms=//invalid:not_a_platform");
-    UnloadedToolchainContextKey key =
-        UnloadedToolchainContextKey.key()
+    ToolchainContextKey key =
+        ToolchainContextKey.key()
             .configurationKey(targetConfigKey)
             .requiredToolchainTypeLabels(testToolchainTypeLabel)
             .build();
@@ -301,8 +300,8 @@ public void resolve_invalidTargetPlatform_badPackage() throws Exception {
   public void resolve_invalidHostPlatform() throws Exception {
     scratch.file("invalid/BUILD", "filegroup(name = 'not_a_platform')");
     useConfiguration("--host_platform=//invalid:not_a_platform");
-    UnloadedToolchainContextKey key =
-        UnloadedToolchainContextKey.key()
+    ToolchainContextKey key =
+        ToolchainContextKey.key()
             .configurationKey(targetConfigKey)
             .requiredToolchainTypeLabels(testToolchainTypeLabel)
             .build();
@@ -325,8 +324,8 @@ public void resolve_invalidHostPlatform() throws Exception {
   public void resolve_invalidExecutionPlatform() throws Exception {
     scratch.file("invalid/BUILD", "filegroup(name = 'not_a_platform')");
     useConfiguration("--extra_execution_platforms=//invalid:not_a_platform");
-    UnloadedToolchainContextKey key =
-        UnloadedToolchainContextKey.key()
+    ToolchainContextKey key =
+        ToolchainContextKey.key()
             .configurationKey(targetConfigKey)
             .requiredToolchainTypeLabels(testToolchainTypeLabel)
             .build();
@@ -366,8 +365,8 @@ public void resolve_execConstraints() throws Exception {
         "register_execution_platforms('//platforms:mac', '//platforms:linux')");
 
     useConfiguration("--platforms=//platforms:linux");
-    UnloadedToolchainContextKey key =
-        UnloadedToolchainContextKey.key()
+    ToolchainContextKey key =
+        ToolchainContextKey.key()
             .configurationKey(targetConfigKey)
             .requiredToolchainTypeLabels(testToolchainTypeLabel)
             .execConstraintLabels(Label.parseAbsoluteUnchecked("//constraints:linux"))
@@ -395,8 +394,8 @@ public void resolve_execConstraints() throws Exception {
 
   @Test
   public void resolve_execConstraints_invalid() throws Exception {
-    UnloadedToolchainContextKey key =
-        UnloadedToolchainContextKey.key()
+    ToolchainContextKey key =
+        ToolchainContextKey.key()
             .configurationKey(targetConfigKey)
             .requiredToolchainTypeLabels(testToolchainTypeLabel)
             .execConstraintLabels(Label.parseAbsoluteUnchecked("//platforms:linux"))
@@ -447,8 +446,8 @@ public void resolve_noMatchingPlatform() throws Exception {
         "register_execution_platforms('//platforms:mac', '//platforms:linux')");
 
     useConfiguration("--platforms=//platforms:linux");
-    UnloadedToolchainContextKey key =
-        UnloadedToolchainContextKey.key()
+    ToolchainContextKey key =
+        ToolchainContextKey.key()
             .configurationKey(targetConfigKey)
             .requiredToolchainTypeLabels(
                 Label.parseAbsoluteUnchecked("//a:toolchain_type_A"),