Allow Skyframe graph lookups and value retrievals to throw InterruptedException.
The only place we now don't handle InterruptedException is in the action graph created after analysis, since I'm not sure that will be around for that much longer.
--
MOS_MIGRATED_REVID=130327770
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 c1f8c33..d94be28 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
@@ -57,7 +57,6 @@
import com.google.devtools.build.skyframe.SkyFunctionException;
import com.google.devtools.build.skyframe.SkyKey;
import com.google.devtools.build.skyframe.SkyValue;
-
import javax.annotation.Nullable;
/**
@@ -93,9 +92,9 @@
* @return {@code null} if dependencies cannot be satisfied.
*/
@Nullable
- public static SkylarkAspect loadSkylarkAspect(
+ static SkylarkAspect loadSkylarkAspect(
Environment env, Label extensionLabel, String skylarkValueName)
- throws AspectCreationException {
+ throws AspectCreationException, InterruptedException {
SkyKey importFileKey = SkylarkImportLookupValue.key(extensionLabel, false);
try {
SkylarkImportLookupValue skylarkImportLookupValue =
@@ -275,8 +274,13 @@
}
}
- private SkyValue createAliasAspect(Environment env, Target originalTarget, Label aliasLabel,
- Aspect aspect, AspectKey originalKey) {
+ private static SkyValue createAliasAspect(
+ Environment env,
+ Target originalTarget,
+ Label aliasLabel,
+ Aspect aspect,
+ AspectKey originalKey)
+ throws InterruptedException {
SkyKey depKey = AspectValue.key(aliasLabel,
originalKey.getAspectConfiguration(),
originalKey.getBaseConfiguration(),
