commit 3fed869b0f6bdd6f35ddd5e76e15dc83786587bd
author jcater <jcater@google.com> Mon Apr 01 13:36:36 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 01 13:38:25 2019 -0700
tree a6d5fa2441474497fb01aab7e54bcc56fae7041f
parent 01e32a29c34e3e75d6c57d4dea056b3efa97b176

Fix ToolchainResolver to show an error when a toolchain type resolves to an
existing but invalid target.

PiperOrigin-RevId: 241389281

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 6ccbdd1..2194808 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
@@ -497,6 +497,10 @@
       }
     } catch (AspectCreationException e) {
       throw new AspectFunctionException(e);
+    } catch (ToolchainException e) {
+      throw new AspectFunctionException(
+          new AspectCreationException(
+              e.getMessage(), new LabelCause(key.getLabel(), e.getMessage())));
     }
   }