commit fc567b333e4bb6d2f5f64024c4adba1f446da3b4
author Marian Lobur <loburm@google.com> Mon Sep 14 08:44:25 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Mon Sep 14 15:39:33 2015 +0000
tree 7bcc1b83883e454a632d8383d28624d78d43d264
parent c9e52201d11765638101e570664b09eaf1357cbd

Fix a bug, when we have dependency from one aspect to another aspect1->aspect2 and aspect2 fails then aspect1 throws IllegalStateException.

--
MOS_MIGRATED_REVID=102976139

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 a4d54c0..87523c1 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
@@ -129,6 +129,8 @@
           transitivePackages);
     } catch (DependencyEvaluationException e) {
       throw new AspectFunctionException(e.getRootCauseSkyKey(), e.getCause());
+    } catch (AspectCreationException e) {
+      throw new AspectFunctionException(e);
     }
   }
 

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 8067e60..7fe19c5 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
@@ -193,6 +193,9 @@
       return ans;
     } catch (DependencyEvaluationException e) {
       throw new ConfiguredTargetFunctionException(e.getRootCauseSkyKey(), e.getCause());
+    } catch (AspectCreationException e) {
+      throw new ConfiguredTargetFunctionException(
+          new ConfiguredValueCreationException(e.getMessage()));
     }
   }
 
@@ -224,7 +227,7 @@
       AspectDefinition aspectDefinition, AspectParameters aspectParameters, 
       Set<ConfigMatchingProvider> configConditions, RuleClassProvider ruleClassProvider,
       BuildConfiguration hostConfiguration, NestedSetBuilder<Package> transitivePackages)
-      throws DependencyEvaluationException {
+      throws DependencyEvaluationException, AspectCreationException {
 
     // Create the map from attributes to list of (target, configuration) pairs.
     ListMultimap<Attribute, Dependency> depValueNames;
@@ -483,7 +486,7 @@
   private static ListMultimap<SkyKey, Aspect> resolveAspectDependencies(Environment env,
       Map<SkyKey, ConfiguredTarget> configuredTargetMap, Iterable<Dependency> deps,
       NestedSetBuilder<Package> transitivePackages)
-      throws DependencyEvaluationException {
+      throws AspectCreationException {
     ListMultimap<SkyKey, Aspect> result = ArrayListMultimap.create();
     Set<SkyKey> aspectKeys = new HashSet<>();
     for (Dependency dep : deps) {
@@ -517,12 +520,12 @@
         } catch (ConfiguredValueCreationException e) {
           // The configured target should have been created in resolveConfiguredTargetDependencies()
           throw new IllegalStateException(e);
-        } catch (NoSuchThingException | AspectCreationException e) {
+        } catch (NoSuchThingException e) {
           AspectFactory<?, ?, ?> depAspectFactory =
               AspectFactory.Util.create(depAspect.getAspectFactory());
-          throw new DependencyEvaluationException(new ConfiguredValueCreationException(
+          throw new AspectCreationException(
               String.format("Evaluation of aspect %s on %s failed: %s",
-                  depAspectFactory.getDefinition().getName(), dep.getLabel(), e.toString())));
+                  depAspectFactory.getDefinition().getName(), dep.getLabel(), e.toString()));
         }
 
         if (aspectValue == null) {