commit d83af9e7eb5e3948500a525f30616c3a03205bb8
author Dmitry Lomov <dslomov@google.com> Thu Feb 23 15:44:23 2017 +0000
committer Irina Iancu <elenairina@google.com> Fri Feb 24 08:28:49 2017 +0000
tree 7f98709a60b44e3c520d9ea1dba5b0c2b7818a4f
parent e64ed19eeb50222c6c8b7935e3d66a6090a03999

Report inconsistent aspect order error to the user.

--
PiperOrigin-RevId: 148342788
MOS_MIGRATED_REVID=148342788

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java
index bd5eef5..7789164 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java
@@ -19,6 +19,7 @@
 import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.Dependency;
+import com.google.devtools.build.lib.analysis.DependencyResolver.InconsistentAspectOrderException;
 import com.google.devtools.build.lib.analysis.LabelAndConfiguration;
 import com.google.devtools.build.lib.analysis.TargetAndConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
@@ -111,11 +112,8 @@
         deps = ConfiguredTargetFunction.getDynamicConfigurations(env, ctgValue, deps,
             hostConfiguration, ruleClassProvider);
       }
-    } catch (EvalException e) {
-      throw new PostConfiguredTargetFunctionException(e);
-    } catch (ConfiguredTargetFunction.DependencyEvaluationException e) {
-      throw new PostConfiguredTargetFunctionException(e);
-    } catch (InvalidConfigurationException e) {
+    } catch (EvalException | ConfiguredTargetFunction.DependencyEvaluationException
+        | InvalidConfigurationException | InconsistentAspectOrderException e) {
       throw new PostConfiguredTargetFunctionException(e);
     }