commit 53a87b9b9888092f28ce65c29a4beaef2e3cca7d
author John Cater <jcater@google.com> Tue Aug 01 00:53:39 2017 +0200
committer Dmitry Lomov <dslomov@google.com> Tue Aug 01 12:21:59 2017 +0200
tree 6bf6cfcbd72f6e10a12496d0fb36350864513c68
parent 899211db325872f045db1e061597861d9064064f

Improve error message when requesting an invalid toolchain type from the context.

Fixes #3428.

Change-Id: Ib3f45bc6856651cfb29d338d0b4480ba1dd77cea
PiperOrigin-RevId: 163760940

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 4e3356d..1b783b9 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
@@ -234,10 +234,11 @@
       // Determine what toolchains are needed by this target.
       ToolchainContext toolchainContext = null;
       if (target instanceof Rule) {
-        ImmutableList<Label> requiredToolchains =
-            ((Rule) target).getRuleClassObject().getRequiredToolchains();
+        Rule rule = ((Rule) target);
+        ImmutableList<Label> requiredToolchains = rule.getRuleClassObject().getRequiredToolchains();
         toolchainContext =
-            ToolchainUtil.createToolchainContext(env, requiredToolchains, configuration);
+            ToolchainUtil.createToolchainContext(
+                env, rule.toString(), requiredToolchains, configuration);
         if (env.valuesMissing()) {
           return null;
         }