ConfiguredTargetFactory shouldn't directly use AspectFunction's exception types.
This removes a dependency cycle between the two classes.
PiperOrigin-RevId: 305566749
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 bc57596..1ddd460 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
@@ -639,6 +639,8 @@
} catch (MissingDepException e) {
Preconditions.checkState(env.valuesMissing());
return null;
+ } catch (ActionConflictException e) {
+ throw new AspectFunctionException(e);
} finally {
CurrentRuleTracker.endConfiguredAspect();
}