From 95c71f04bbe24a5211ec27c6e5ed03d4d70c9d86 Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall <dwagnerhall@apple.com>
Date: Tue, 26 Apr 2022 14:16:29 +0100
Subject: [PATCH] Always use RewindableGraphInconsistencyReceiver

---
 .../build/lib/skyframe/SequencedSkyframeExecutor.java      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
index 27a46b17cd48d6..184940f3050386 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
@@ -167,7 +167,7 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor {
   private Duration outputTreeDiffCheckingDuration = Duration.ofSeconds(-1L);
 
   private final WorkspaceInfoFromDiffReceiver workspaceInfoFromDiffReceiver;
-  private GraphInconsistencyReceiver inconsistencyReceiver = GraphInconsistencyReceiver.THROWING;
+  private GraphInconsistencyReceiver inconsistencyReceiver = new RewindableGraphInconsistencyReceiver();
 
   private SequencedSkyframeExecutor(
       Consumer<SkyframeExecutor> skyframeExecutorConsumerOnInit,
@@ -273,11 +273,6 @@ public WorkspaceInfoFromDiff sync(
       OptionsProvider options)
       throws InterruptedException, AbruptExitException {
     if (evaluatorNeedsReset) {
-      // Rewinding is only supported with no incremental state and no action cache.
-      inconsistencyReceiver =
-          trackIncrementalState || useActionCache(options)
-              ? GraphInconsistencyReceiver.THROWING
-              : new RewindableGraphInconsistencyReceiver();
       // Recreate MemoizingEvaluator so that graph is recreated with correct edge-clearing status,
       // or if the graph doesn't have edges, so that a fresh graph can be used.
       resetEvaluator();