Remove dead code.

PiperOrigin-RevId: 601446710 Change-Id: I14d9823ee22bcf708b47366fd2616c8565b67032
bazelbuild · Jan 25, 2024 · c5978dd · c5978dd
1 parent 4884a7b
commit c5978dd
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 18 deletions.
diff --git a/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java
@@ -120,8 +120,7 @@ abstract class AbstractParallelEvaluator {
       InflightTrackingProgressReceiver progressReceiver,
       GraphInconsistencyReceiver graphInconsistencyReceiver,
       QuiescingExecutor executor,
-      CycleDetector cycleDetector,
-      boolean mergingSkyframeAnalysisExecutionPhases) {
+      CycleDetector cycleDetector) {
     this.graph = graph;
     this.cycleDetector = cycleDetector;
     this.evaluatorContext =
@@ -138,7 +137,6 @@ abstract class AbstractParallelEvaluator {
             errorInfoManager,
             graphInconsistencyReceiver,
             () -> new NodeEntryVisitor(executor, progressReceiver, Evaluate::new, stateCache),
-            /* mergingSkyframeAnalysisExecutionPhases= */ mergingSkyframeAnalysisExecutionPhases,
             stateCache);
   }
 

diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
@@ -158,7 +158,6 @@ public <T extends SkyValue> EvaluationResult<T> evaluate(
                                 evaluationContext.getParallelism(),
                                 ParallelEvaluatorErrorClassifier.instance())),
                 new SimpleCycleDetector(),
-                evaluationContext.mergingSkyframeAnalysisExecutionPhases(),
                 evaluationContext.getUnnecessaryTemporaryStateDropperReceiver());
         result = evaluator.eval(roots);
       }

diff --git a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
@@ -69,7 +69,6 @@ public ParallelEvaluator(
       GraphInconsistencyReceiver graphInconsistencyReceiver,
       QuiescingExecutor executor,
       CycleDetector cycleDetector,
-      boolean mergingSkyframeAnalysisExecutionPhases,
       UnnecessaryTemporaryStateDropperReceiver unnecessaryTemporaryStateDropperReceiver) {
     super(
         graph,
@@ -84,8 +83,7 @@ public ParallelEvaluator(
         progressReceiver,
         graphInconsistencyReceiver,
         executor,
-        cycleDetector,
-        mergingSkyframeAnalysisExecutionPhases);
+        cycleDetector);
     this.unnecessaryTemporaryStateDropperReceiver = unnecessaryTemporaryStateDropperReceiver;
   }
 

diff --git a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluatorContext.java b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluatorContext.java
@@ -47,7 +47,6 @@ class ParallelEvaluatorContext {
   private final EventFilter storedEventFilter;
   private final ErrorInfoManager errorInfoManager;
   private final GraphInconsistencyReceiver graphInconsistencyReceiver;
-  private final boolean mergingSkyframeAnalysisExecutionPhases;
   private final Cache<SkyKey, SkyKeyComputeState> stateCache;
 
   /**
@@ -76,7 +75,6 @@ public ParallelEvaluatorContext(
       ErrorInfoManager errorInfoManager,
       GraphInconsistencyReceiver graphInconsistencyReceiver,
       Supplier<NodeEntryVisitor> visitorSupplier,
-      boolean mergingSkyframeAnalysisExecutionPhases,
       Cache<SkyKey, SkyKeyComputeState> stateCache) {
     this.graph = graph;
     this.graphVersion = graphVersion;
@@ -92,7 +90,6 @@ public ParallelEvaluatorContext(
     this.storedEventFilter = storedEventFilter;
     this.errorInfoManager = errorInfoManager;
     this.visitorSupplier = Suppliers.memoize(visitorSupplier);
-    this.mergingSkyframeAnalysisExecutionPhases = mergingSkyframeAnalysisExecutionPhases;
     this.stateCache = stateCache;
   }
 
@@ -178,10 +175,6 @@ ErrorInfoManager getErrorInfoManager() {
     return errorInfoManager;
   }
 
-  boolean mergingSkyframeAnalysisExecutionPhases() {
-    return mergingSkyframeAnalysisExecutionPhases;
-  }
-
   Cache<SkyKey, SkyKeyComputeState> stateCache() {
     return stateCache;
   }

diff --git a/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java b/src/test/java/com/google/devtools/build/skyframe/EagerInvalidatorTest.java
@@ -161,7 +161,6 @@ protected <T extends SkyValue> EvaluationResult<T> eval(
             AbstractQueueVisitor.create(
                 "test-pool", 200, ParallelEvaluatorErrorClassifier.instance()),
             new SimpleCycleDetector(),
-            /* mergingSkyframeAnalysisExecutionPhases= */ false,
             UnnecessaryTemporaryStateDropperReceiver.NULL);
     graphVersion = graphVersion.next();
     return evaluator.eval(ImmutableList.copyOf(keys));

diff --git a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java
@@ -140,7 +140,6 @@ private ParallelEvaluator makeEvaluator(
         GraphInconsistencyReceiver.THROWING,
         AbstractQueueVisitor.create("test-pool", 200, ParallelEvaluatorErrorClassifier.instance()),
         new SimpleCycleDetector(),
-        /* mergingSkyframeAnalysisExecutionPhases= */ false,
         UnnecessaryTemporaryStateDropperReceiver.NULL);
   }
 
@@ -3225,7 +3224,6 @@ public void onEvaluationFinished() {
             AbstractQueueVisitor.create(
                 "test-pool", 1, ParallelEvaluatorErrorClassifier.instance()),
             new SimpleCycleDetector(),
-            /* mergingSkyframeAnalysisExecutionPhases= */ false,
             dropperReceiver);
     // Then, when we evaluate key1,
     SkyValue resultValue = parallelEvaluator.eval(ImmutableList.of(key1)).get(key1);

diff --git a/src/test/java/com/google/devtools/build/skyframe/StateMachineTest.java b/src/test/java/com/google/devtools/build/skyframe/StateMachineTest.java
@@ -76,7 +76,6 @@ private <T extends SkyValue> EvaluationResult<T> eval(SkyKey root, boolean keepG
             AbstractQueueVisitor.create(
                 "test-pool", TEST_PARALLELISM, ParallelEvaluatorErrorClassifier.instance()),
             new SimpleCycleDetector(),
-            /* mergingSkyframeAnalysisExecutionPhases= */ false,
             UnnecessaryTemporaryStateDropperReceiver.NULL)
         .eval(ImmutableList.of(root));
   }