commit 5074514102c2ff177c7069151c2c4c7c6befbfc0
author John Cater <jcater@google.com> Tue Apr 16 07:41:24 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Apr 16 07:43:30 2019 -0700
tree 7723964adf7c75c0aeb7fdf8608144e377881d7c
parent 7f26f7df6398d12b0f13245ab303a70f6e60784f

Move UnloadedToolchainContext.load to ResolvedToolchainContext.

Also pass target description directly to load().

Part of work on execution transitions, #7935.

Closes #8045.

PiperOrigin-RevId: 243805205

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index 03665ed..6dde831 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -415,11 +415,6 @@
           ImmutableSet<Label> requiredToolchains = aspect.getDefinition().getRequiredToolchains();
           unloadedToolchainContext =
               new ToolchainResolver(env, BuildConfigurationValue.key(configuration))
-                  .setTargetDescription(
-                      String.format(
-                          "aspect %s applied to %s",
-                          aspect.getDescriptor().getDescription(),
-                          associatedConfiguredTargetAndData.getTarget()))
                   .setRequiredToolchainTypes(requiredToolchains)
                   .resolve();
         } catch (ToolchainException e) {
@@ -463,8 +458,16 @@
       // Load the requested toolchains into the ToolchainContext, now that we have dependencies.
       ResolvedToolchainContext toolchainContext = null;
       if (unloadedToolchainContext != null) {
+        String targetDescription =
+            String.format(
+                "aspect %s applied to %s",
+                aspect.getDescriptor().getDescription(),
+                associatedConfiguredTargetAndData.getTarget());
         toolchainContext =
-            unloadedToolchainContext.load(depValueMap.get(DependencyResolver.TOOLCHAIN_DEPENDENCY));
+            ResolvedToolchainContext.load(
+                unloadedToolchainContext,
+                targetDescription,
+                depValueMap.get(DependencyResolver.TOOLCHAIN_DEPENDENCY));
       }
 
       return createAspect(