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/ConfiguredTargetFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
index 77758cd..fd9e90e 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
@@ -311,7 +311,6 @@
           ImmutableSet<Label> execConstraintLabels = getExecutionPlatformConstraints(rule);
           unloadedToolchainContext =
               new ToolchainResolver(env, configuredTargetKey.getConfigurationKey())
-                  .setTargetDescription(rule.toString())
                   .setRequiredToolchainTypes(requiredToolchains)
                   .setExecConstraintLabels(execConstraintLabels)
                   .resolve();
@@ -350,8 +349,12 @@
       // Load the requested toolchains into the ToolchainContext, now that we have dependencies.
       ResolvedToolchainContext toolchainContext = null;
       if (unloadedToolchainContext != null) {
+        String targetDescription = target.toString();
         toolchainContext =
-            unloadedToolchainContext.load(depValueMap.get(DependencyResolver.TOOLCHAIN_DEPENDENCY));
+            ResolvedToolchainContext.load(
+                unloadedToolchainContext,
+                targetDescription,
+                depValueMap.get(DependencyResolver.TOOLCHAIN_DEPENDENCY));
       }
 
       ConfiguredTargetValue ans =