commit a47ca0114e2ea79fa2ebfc317889377ae7e8427f
author Ulf Adams <ulfjack@google.com> Wed Jan 20 10:35:19 2016 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Wed Jan 20 11:36:55 2016 +0000
tree 44f6ad6ca02220ce36e1eefcda147f8a584ec998
parent 520f3c583f6ca89041ce47dfc0178e2810e2f428

Fix a couple of bugs related to error handling for top-level aspects.

--
MOS_MIGRATED_REVID=112561390

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 aafa943..032434d 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.skyframe.AspectValue.AspectKey;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetFunction.DependencyEvaluationException;
 import com.google.devtools.build.lib.skyframe.SkyframeExecutor.BuildViewProvider;
+import com.google.devtools.build.lib.skyframe.SkylarkImportLookupFunction.SkylarkImportFailedException;
 import com.google.devtools.build.lib.syntax.Type.ConversionException;
 import com.google.devtools.build.lib.util.Preconditions;
 import com.google.devtools.build.skyframe.SkyFunction;
@@ -72,11 +73,11 @@
   @Nullable
   public static SkylarkAspect loadSkylarkAspect(
       Environment env, Label extensionLabel, String skylarkValueName)
-      throws ConversionException {
-    
+      throws ConversionException, SkylarkImportFailedException {
     SkyKey importFileKey = SkylarkImportLookupValue.key(extensionLabel, false);
     SkylarkImportLookupValue skylarkImportLookupValue =
-        (SkylarkImportLookupValue) env.getValue(importFileKey);
+        (SkylarkImportLookupValue) env.getValueOrThrow(
+            importFileKey, SkylarkImportFailedException.class);
     if (skylarkImportLookupValue == null) {
       return null;
     }
@@ -107,6 +108,8 @@
         skylarkAspect =
             loadSkylarkAspect(
                 env, skylarkAspectClass.getExtensionLabel(), skylarkAspectClass.getExportedName());
+      } catch (SkylarkImportFailedException e) {
+        throw new AspectFunctionException(skyKey, e);
       } catch (ConversionException e) {
         throw new AspectFunctionException(skyKey, e);
       }