commit e2033b1d28d3f17c7e307f62b2b13c3eed72a7f6
author Dmitry Lomov <dslomov@google.com> Wed Aug 19 16:57:49 2015 +0000
committer Lukacs Berki <lberki@google.com> Thu Aug 20 14:49:12 2015 +0000
tree 25d06fad6196071dd07756c5e1a661bd689198fc
parent 25f4494c484512898671aab57790f4917c0f9319

A prototype implementation of top-level aspects.

--
MOS_MIGRATED_REVID=101033236

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 30358ac..7db3e46 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
@@ -80,9 +80,14 @@
           "aspects must be attached to rules"));
     }
 
-    RuleConfiguredTarget associatedTarget = (RuleConfiguredTarget)
-        ((ConfiguredTargetValue) env.getValue(ConfiguredTargetValue.key(
-            key.getLabel(), key.getConfiguration()))).getConfiguredTarget();
+    final ConfiguredTargetValue configuredTargetValue =
+        (ConfiguredTargetValue)
+            env.getValue(ConfiguredTargetValue.key(key.getLabel(), key.getConfiguration()));
+    if (configuredTargetValue == null) {
+      return null;
+    }
+    RuleConfiguredTarget associatedTarget =
+        (RuleConfiguredTarget) configuredTargetValue.getConfiguredTarget();
 
     if (associatedTarget == null) {
       return null;
@@ -152,7 +157,11 @@
     Preconditions.checkNotNull(aspect);
 
     return new AspectValue(
-        aspect, ImmutableList.copyOf(analysisEnvironment.getRegisteredActions()));
+        key,
+        associatedTarget.getLabel(),
+        associatedTarget.getTarget().getLocation(),
+        aspect,
+        ImmutableList.copyOf(analysisEnvironment.getRegisteredActions()));
   }
 
   @Nullable