Store cycle detectors directly in AbstractParallelEvaluator.

PiperOrigin-RevId: 186617412

2 files changed, 11 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/skyframe/AbstractExceptionalParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/AbstractExceptionalParallelEvaluator.java
index bb9a7621f2..6fe3adc25a 100644
--- a/src/main/java/com/google/devtools/build/skyframe/AbstractExceptionalParallelEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/AbstractExceptionalParallelEvaluator.java
@@ -76,8 +76,6 @@ import javax.annotation.Nullable;
 public abstract class AbstractExceptionalParallelEvaluator<E extends Exception>
     extends AbstractParallelEvaluator {
 
-  private final CycleDetector cycleDetector;
-
   AbstractExceptionalParallelEvaluator(
       ProcessableGraph graph,
       Version graphVersion,
@@ -99,8 +97,8 @@ public abstract class AbstractExceptionalParallelEvaluator<E extends Exception>
         errorInfoManager,
         keepGoing,
         threadCount,
-        progressReceiver);
-    cycleDetector = new SimpleCycleDetector();
+        progressReceiver,
+        new SimpleCycleDetector());
   }
 
   AbstractExceptionalParallelEvaluator(
@@ -125,8 +123,8 @@ public abstract class AbstractExceptionalParallelEvaluator<E extends Exception>
         errorInfoManager,
         keepGoing,
         progressReceiver,
-        forkJoinPool);
-    this.cycleDetector = cycleDetector;
+        forkJoinPool,
+        cycleDetector);
   }
 
   private void informProgressReceiverThatValueIsDone(SkyKey key, NodeEntry entry)
diff --git a/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java
index a103f53457..a8c9747c90 100644
--- a/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java
@@ -54,6 +54,7 @@ public abstract class AbstractParallelEvaluator {
 
   final ProcessableGraph graph;
   final ParallelEvaluatorContext evaluatorContext;
+  protected final CycleDetector cycleDetector;
 
   AbstractParallelEvaluator(
       ProcessableGraph graph,
@@ -65,8 +66,10 @@ public abstract class AbstractParallelEvaluator {
       ErrorInfoManager errorInfoManager,
       boolean keepGoing,
       int threadCount,
-      DirtyTrackingProgressReceiver progressReceiver) {
+      DirtyTrackingProgressReceiver progressReceiver,
+      CycleDetector cycleDetector) {
     this.graph = graph;
+    this.cycleDetector = cycleDetector;
     evaluatorContext =
         new ParallelEvaluatorContext(
             graph,
@@ -92,8 +95,10 @@ public abstract class AbstractParallelEvaluator {
       ErrorInfoManager errorInfoManager,
       boolean keepGoing,
       DirtyTrackingProgressReceiver progressReceiver,
-      ForkJoinPool forkJoinPool) {
+      ForkJoinPool forkJoinPool,
+      CycleDetector cycleDetector) {
     this.graph = graph;
+    this.cycleDetector = cycleDetector;
     evaluatorContext =
         new ParallelEvaluatorContext(
             graph,