commit eadadbd3c479f30a0e0ef5f788cff1aec800cd9d
author Samuel Giddins <segiddins@squareup.com> Mon Aug 17 08:00:05 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Aug 17 08:01:14 2020 -0700
tree f38da276564d3590c8c84ed04fd862df32f08086
parent 460ab684b4203cf87663038e67db352775adfdde

Handle transition exceptions inside AspectFunction

Otherwise, if there are errors over a starlark transitition’d dependency, an illegal cast exception would be raised when attempting to cast to an InvalidConfigurationException

Closes #11752.

PiperOrigin-RevId: 327020578

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 1cfec1c..17ee54d 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
@@ -41,6 +41,7 @@
 import com.google.devtools.build.lib.analysis.config.DependencyEvaluationException;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
 import com.google.devtools.build.lib.analysis.configuredtargets.MergedConfiguredTarget;
+import com.google.devtools.build.lib.analysis.starlark.StarlarkTransition.TransitionException;
 import com.google.devtools.build.lib.causes.Cause;
 import com.google.devtools.build.lib.causes.LabelCause;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -481,6 +482,10 @@
         InconsistentAspectOrderException cause = (InconsistentAspectOrderException) e.getCause();
         throw new AspectFunctionException(
             new AspectCreationException(cause.getMessage(), key.getLabel(), aspectConfiguration));
+      } else if (e.getCause() instanceof TransitionException) {
+        TransitionException cause = (TransitionException) e.getCause();
+        throw new AspectFunctionException(
+            new AspectCreationException(cause.getMessage(), key.getLabel(), aspectConfiguration));
       } else {
         // Cast to InvalidConfigurationException as a consistency check. If you add any
         // DependencyEvaluationException constructors, you may need to change this code, too.