aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
diff options
context:
space:
mode:
authorGravatar Florian Weikert <fwe@google.com>2015-09-14 13:35:34 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2015-09-14 15:40:49 +0000
commit4b67d4fed1f4ca8e4b1dd7dce47061b6b3779860 (patch)
treeeb79083b8d1335d71b27e69d6003d7e7ef12ad72 /src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
parent835ec9e63b9788b7d573cb78fa27b8cbfb5732d9 (diff)
Prevented catching/wrapping of InterruptedExceptions, especially in BaseFunction.
-- MOS_MIGRATED_REVID=102988766
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
index debf6f4a98..05e302c0bc 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
@@ -219,7 +219,7 @@ public abstract class DependencyResolver {
public final ListMultimap<Attribute, Dependency> dependentNodeMap(
TargetAndConfiguration node, BuildConfiguration hostConfig, AspectDefinition aspect,
AspectParameters aspectParameters, Set<ConfigMatchingProvider> configConditions)
- throws EvalException {
+ throws EvalException, InterruptedException {
Target target = node.getTarget();
BuildConfiguration config = node.getConfiguration();
ListMultimap<Attribute, Dependency> outgoingEdges = ArrayListMultimap.create();
@@ -250,7 +250,7 @@ public abstract class DependencyResolver {
private ListMultimap<Attribute, LabelAndConfiguration> resolveAttributes(
Rule rule, AspectDefinition aspect, BuildConfiguration configuration,
BuildConfiguration hostConfiguration, Set<ConfigMatchingProvider> configConditions)
- throws EvalException {
+ throws EvalException, InterruptedException {
ConfiguredAttributeMapper attributeMap = ConfiguredAttributeMapper.of(rule, configConditions);
attributeMap.validateAttributes();
List<Attribute> attributes;
@@ -431,7 +431,7 @@ public abstract class DependencyResolver {
AttributeMap attributeMap,
Iterable<Attribute> attributes,
ImmutableSortedKeyListMultimap.Builder<Attribute, LabelAndConfiguration> builder)
- throws EvalException {
+ throws EvalException, InterruptedException {
for (Attribute attribute : attributes) {
if (!attribute.isLateBound() || !attribute.getCondition().apply(attributeMap)) {
continue;
@@ -501,7 +501,7 @@ public abstract class DependencyResolver {
*/
public final Collection<Dependency> dependentNodes(
TargetAndConfiguration node, BuildConfiguration hostConfig,
- Set<ConfigMatchingProvider> configConditions) {
+ Set<ConfigMatchingProvider> configConditions) throws InterruptedException {
try {
return ImmutableSet.copyOf(dependentNodeMap(node, hostConfig, /*aspect=*/null,
AspectParameters.EMPTY, configConditions).values());