diff --git a/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java
new file mode 100644
index 0000000..1e70b20
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/skyframe/AbstractParallelEvaluator.java
@@ -0,0 +1,633 @@
+// Copyright 2017 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.skyframe;
+
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import com.google.devtools.build.lib.events.Event;
+import com.google.devtools.build.lib.events.ExtendedEventHandler;
+import com.google.devtools.build.lib.profiler.Profiler;
+import com.google.devtools.build.lib.profiler.ProfilerTask;
+import com.google.devtools.build.lib.util.BlazeClock;
+import com.google.devtools.build.lib.util.GroupedList.GroupedListHelper;
+import com.google.devtools.build.lib.util.Preconditions;
+import com.google.devtools.build.skyframe.EvaluationProgressReceiver.EvaluationState;
+import com.google.devtools.build.skyframe.MemoizingEvaluator.EmittedEventState;
+import com.google.devtools.build.skyframe.NodeEntry.DependencyState;
+import com.google.devtools.build.skyframe.NodeEntry.DirtyState;
+import com.google.devtools.build.skyframe.ParallelEvaluatorContext.EnqueueParentBehavior;
+import com.google.devtools.build.skyframe.QueryableGraph.Reason;
+import com.google.devtools.build.skyframe.SkyFunctionException.ReifiedSkyFunctionException;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ForkJoinPool;
+import java.util.logging.Logger;
+import javax.annotation.Nullable;
+
+/**
+ * Defines the evaluation action used in the multi-threaded Skyframe evaluation, and constructs the
+ * {@link ParallelEvaluatorContext} that the actions rely on.
+ *
+ * <p>This does not implement other parts of Skyframe evaluation setup and post-processing, such as
+ * translating a set of requested top-level nodes into actions, or constructing an evaluation
+ * result. Derived classes should do this.
+ */
+public abstract class AbstractParallelEvaluator {
+  private static final Logger logger = Logger.getLogger(ParallelEvaluator.class.getName());
+
+  final ProcessableGraph graph;
+  final ParallelEvaluatorContext evaluatorContext;
+
+  AbstractParallelEvaluator(
+      ProcessableGraph graph,
+      Version graphVersion,
+      ImmutableMap<SkyFunctionName, ? extends SkyFunction> skyFunctions,
+      final ExtendedEventHandler reporter,
+      EmittedEventState emittedEventState,
+      EventFilter storedEventFilter,
+      ErrorInfoManager errorInfoManager,
+      boolean keepGoing,
+      int threadCount,
+      DirtyTrackingProgressReceiver progressReceiver) {
+    this.graph = graph;
+    evaluatorContext =
+        new ParallelEvaluatorContext(
+            graph,
+            graphVersion,
+            skyFunctions,
+            reporter,
+            emittedEventState,
+            keepGoing,
+            progressReceiver,
+            storedEventFilter,
+            errorInfoManager,
+            Evaluate::new,
+            threadCount);
+  }
+
+  AbstractParallelEvaluator(
+      ProcessableGraph graph,
+      Version graphVersion,
+      ImmutableMap<SkyFunctionName, ? extends SkyFunction> skyFunctions,
+      final ExtendedEventHandler reporter,
+      EmittedEventState emittedEventState,
+      EventFilter storedEventFilter,
+      ErrorInfoManager errorInfoManager,
+      boolean keepGoing,
+      DirtyTrackingProgressReceiver progressReceiver,
+      ForkJoinPool forkJoinPool) {
+    this.graph = graph;
+    evaluatorContext =
+        new ParallelEvaluatorContext(
+            graph,
+            graphVersion,
+            skyFunctions,
+            reporter,
+            emittedEventState,
+            keepGoing,
+            progressReceiver,
+            storedEventFilter,
+            errorInfoManager,
+            Evaluate::new,
+            Preconditions.checkNotNull(forkJoinPool));
+  }
+
+  /**
+   * If the entry is dirty and not already rebuilding, puts it in a state so that it can rebuild.
+   */
+  static void maybeMarkRebuilding(NodeEntry entry) {
+    if (entry.isDirty() && entry.getDirtyState() != DirtyState.REBUILDING) {
+      entry.markRebuilding();
+    }
+  }
+
+  enum DirtyOutcome {
+    ALREADY_PROCESSED,
+    NEEDS_EVALUATION
+  }
+
+  /** An action that evaluates a value. */
+  private class Evaluate implements Runnable {
+    /** The name of the value to be evaluated. */
+    private final SkyKey skyKey;
+
+    private Evaluate(SkyKey skyKey) {
+      this.skyKey = skyKey;
+    }
+
+    private void enqueueChild(
+        SkyKey skyKey,
+        NodeEntry entry,
+        SkyKey child,
+        NodeEntry childEntry,
+        boolean depAlreadyExists)
+        throws InterruptedException {
+      Preconditions.checkState(!entry.isDone(), "%s %s", skyKey, entry);
+      DependencyState dependencyState =
+          depAlreadyExists
+              ? childEntry.checkIfDoneForDirtyReverseDep(skyKey)
+              : childEntry.addReverseDepAndCheckIfDone(skyKey);
+      switch (dependencyState) {
+        case DONE:
+          if (entry.signalDep(childEntry.getVersion())) {
+            // This can only happen if there are no more children to be added.
+            evaluatorContext.getVisitor().enqueueEvaluation(skyKey);
+          }
+          break;
+        case ALREADY_EVALUATING:
+          break;
+        case NEEDS_SCHEDULING:
+          evaluatorContext.getVisitor().enqueueEvaluation(child);
+          break;
+      }
+    }
+
+    /**
+     * Returns true if this depGroup consists of the error transience value and the error transience
+     * value is newer than the entry, meaning that the entry must be re-evaluated.
+     */
+    private boolean invalidatedByErrorTransience(Collection<SkyKey> depGroup, NodeEntry entry)
+        throws InterruptedException {
+      return depGroup.size() == 1
+          && depGroup.contains(ErrorTransienceValue.KEY)
+          && !graph.get(
+          null, Reason.OTHER, ErrorTransienceValue.KEY).getVersion().atMost(entry.getVersion());
+    }
+
+    private DirtyOutcome maybeHandleDirtyNode(NodeEntry state) throws InterruptedException {
+      if (!state.isDirty()) {
+        return DirtyOutcome.NEEDS_EVALUATION;
+      }
+      while (state.getDirtyState().equals(DirtyState.CHECK_DEPENDENCIES)) {
+        // Evaluating a dirty node for the first time, and checking its children to see if any
+        // of them have changed. Note that there must be dirty children for this to happen.
+
+        // Check the children group by group -- we don't want to evaluate a value that is no
+        // longer needed because an earlier dependency changed. For example, //foo:foo depends
+        // on target //bar:bar and is built. Then foo/BUILD is modified to remove the dependence
+        // on bar, and bar/BUILD is deleted. Reloading //bar:bar would incorrectly throw an
+        // exception. To avoid this, we must reload foo/BUILD first, at which point we will
+        // discover that it has changed, and re-evaluate target //foo:foo from scratch.
+        // On the other hand, when an action requests all of its inputs, we can safely check all
+        // of them in parallel on a subsequent build. So we allow checking an entire group in
+        // parallel here, if the node builder requested a group last build.
+        // Note: every dep returned here must either have this node re-registered for it (using
+        // checkIfDoneForDirtyReverseDep) and be registered as a direct dep of this node, or have
+        // its reverse dep on this node removed. Failing to do either one of these would result in
+        // a graph inconsistency, where the child had a reverse dep on this node, but this node
+        // had no kind of dependency on the child.
+        Collection<SkyKey> directDepsToCheck = state.getNextDirtyDirectDeps();
+
+        if (invalidatedByErrorTransience(directDepsToCheck, state)) {
+          // If this dep is the ErrorTransienceValue and the ErrorTransienceValue has been
+          // updated then we need to force a rebuild. We would like to just signal the entry as
+          // usual, but we can't, because then the ErrorTransienceValue would remain as a dep,
+          // which would be incorrect if, for instance, the value re-evaluated to a non-error.
+          state.forceRebuild();
+          graph.get(skyKey, Reason.RDEP_REMOVAL, ErrorTransienceValue.KEY).removeReverseDep(skyKey);
+          return DirtyOutcome.NEEDS_EVALUATION;
+        }
+        if (!evaluatorContext.keepGoing()) {
+          // This check ensures that we maintain the invariant that if a node with an error is
+          // reached during a no-keep-going build, none of its currently building parents
+          // finishes building. If the child isn't done building yet, it will detect on its own
+          // that it has an error (see the VERIFIED_CLEAN case below). On the other hand, if it
+          // is done, then it is the parent's responsibility to notice that, which we do here.
+          // We check the deps for errors so that we don't continue building this node if it has
+          // a child error.
+          Map<SkyKey, ? extends NodeEntry> entriesToCheck =
+              graph.getBatch(skyKey, Reason.OTHER, directDepsToCheck);
+          for (Entry<SkyKey, ? extends NodeEntry> entry : entriesToCheck.entrySet()) {
+            if (entry.getValue().isDone() && entry.getValue().getErrorInfo() != null) {
+              // If any child has an error, we arbitrarily add a dep on the first one (needed
+              // for error bubbling) and throw an exception coming from it.
+              SkyKey errorKey = entry.getKey();
+              NodeEntry errorEntry = entry.getValue();
+              state.addTemporaryDirectDeps(GroupedListHelper.create(errorKey));
+              errorEntry.checkIfDoneForDirtyReverseDep(skyKey);
+              // Perform the necessary bookkeeping for any deps that are not being used.
+              for (Entry<SkyKey, ? extends NodeEntry> depEntry : entriesToCheck.entrySet()) {
+                if (!depEntry.getKey().equals(errorKey)) {
+                  depEntry.getValue().removeReverseDep(skyKey);
+                }
+              }
+              if (!evaluatorContext.getVisitor().preventNewEvaluations()) {
+                // An error was already thrown in the evaluator. Don't do anything here.
+                return DirtyOutcome.ALREADY_PROCESSED;
+              }
+              throw SchedulerException.ofError(errorEntry.getErrorInfo(), entry.getKey());
+            }
+          }
+        }
+        // It is safe to add these deps back to the node -- even if one of them has changed, the
+        // contract of pruning is that the node will request these deps again when it rebuilds.
+        // We must add these deps before enqueuing them, so that the node knows that it depends
+        // on them. If one of these deps is the error transience node, the check we did above
+        // in #invalidatedByErrorTransience means that the error transience node is not newer
+        // than this node, so we are going to mark it clean (since the error transience node is
+        // always the last dep).
+        state.addTemporaryDirectDepsGroupToDirtyEntry(directDepsToCheck);
+        DepsReport depsReport = graph.analyzeDepsDoneness(skyKey, directDepsToCheck);
+        Collection<SkyKey> unknownStatusDeps =
+            depsReport.hasInformation() ? depsReport : directDepsToCheck;
+        boolean needsScheduling = false;
+        for (int i = 0; i < directDepsToCheck.size() - unknownStatusDeps.size(); i++) {
+          // Since all of these nodes were done at an earlier version than this one, we may safely
+          // signal with the minimal version, since they cannot trigger a re-evaluation.
+          needsScheduling = state.signalDep(MinimalVersion.INSTANCE);
+        }
+        if (needsScheduling) {
+          Preconditions.checkState(
+              unknownStatusDeps.isEmpty(),
+              "Ready without all deps checked? %s %s %s",
+              skyKey,
+              state,
+              unknownStatusDeps);
+          continue;
+        }
+        Map<SkyKey, ? extends NodeEntry> oldChildren =
+            graph.getBatch(skyKey, Reason.ENQUEUING_CHILD, unknownStatusDeps);
+        Preconditions.checkState(
+            oldChildren.size() == unknownStatusDeps.size(),
+            "Not all old children were present: %s %s %s %s %s",
+            skyKey,
+            state,
+            unknownStatusDeps,
+            oldChildren,
+            directDepsToCheck);
+        for (Map.Entry<SkyKey, ? extends NodeEntry> e : oldChildren.entrySet()) {
+          SkyKey directDep = e.getKey();
+          NodeEntry directDepEntry = e.getValue();
+          // TODO(bazel-team): If this signals the current node, consider falling through to the
+          // VERIFIED_CLEAN case below directly, without scheduling a new Evaluate().
+          enqueueChild(skyKey, state, directDep, directDepEntry, /*depAlreadyExists=*/ true);
+        }
+        return DirtyOutcome.ALREADY_PROCESSED;
+      }
+      switch (state.getDirtyState()) {
+        case VERIFIED_CLEAN:
+          // No child has a changed value. This node can be marked done and its parents signaled
+          // without any re-evaluation.
+          Set<SkyKey> reverseDeps = state.markClean();
+          // Tell the receiver that the value was not actually changed this run.
+          evaluatorContext.getProgressReceiver()
+              .evaluated(skyKey, new SkyValueSupplier(state), EvaluationState.CLEAN);
+          if (!evaluatorContext.keepGoing() && state.getErrorInfo() != null) {
+            if (!evaluatorContext.getVisitor().preventNewEvaluations()) {
+              return DirtyOutcome.ALREADY_PROCESSED;
+            }
+            throw SchedulerException.ofError(state.getErrorInfo(), skyKey);
+          }
+          evaluatorContext.signalValuesAndEnqueueIfReady(
+              skyKey, reverseDeps, state.getVersion(), EnqueueParentBehavior.ENQUEUE);
+          return DirtyOutcome.ALREADY_PROCESSED;
+        case NEEDS_REBUILDING:
+          maybeMarkRebuilding(state);
+          // Fall through to REBUILDING case.
+        case REBUILDING:
+          return DirtyOutcome.NEEDS_EVALUATION;
+        default:
+          throw new IllegalStateException("key: " + skyKey + ", entry: " + state);
+      }
+    }
+
+    @Override
+    public void run() {
+      try {
+        NodeEntry state =
+            Preconditions.checkNotNull(graph.get(null, Reason.EVALUATION, skyKey), skyKey);
+        Preconditions.checkState(state.isReady(), "%s %s", skyKey, state);
+        if (maybeHandleDirtyNode(state) == DirtyOutcome.ALREADY_PROCESSED) {
+          return;
+        }
+
+        Set<SkyKey> oldDeps = state.getAllRemainingDirtyDirectDeps();
+        SkyFunctionEnvironment env =
+            new SkyFunctionEnvironment(
+                skyKey, state.getTemporaryDirectDeps(), oldDeps, evaluatorContext);
+        SkyFunctionName functionName = skyKey.functionName();
+        SkyFunction factory =
+            Preconditions.checkNotNull(
+                evaluatorContext.getSkyFunctions().get(functionName),
+                "Unable to find SkyFunction '%s' for node with key %s, %s",
+                functionName,
+                skyKey,
+                state);
+
+        SkyValue value = null;
+        long startTime = BlazeClock.instance().nanoTime();
+        try {
+          try {
+            evaluatorContext.getProgressReceiver().computing(skyKey);
+            value = factory.compute(skyKey, env);
+          } finally {
+            long elapsedTimeNanos = BlazeClock.instance().nanoTime() - startTime;
+            if (elapsedTimeNanos > 0) {
+              evaluatorContext.getProgressReceiver().computed(skyKey, elapsedTimeNanos);
+              Profiler.instance()
+                  .logSimpleTaskDuration(
+                      startTime, elapsedTimeNanos, ProfilerTask.SKYFUNCTION, skyKey);
+            }
+          }
+        } catch (final SkyFunctionException builderException) {
+          ReifiedSkyFunctionException reifiedBuilderException =
+              new ReifiedSkyFunctionException(builderException, skyKey);
+          // In keep-going mode, we do not let SkyFunctions throw errors with missing deps -- we
+          // will restart them when their deps are done, so we can have a definitive error and
+          // definitive graph structure, thus avoiding non-determinism. It's completely reasonable
+          // for SkyFunctions to throw eagerly because they do not know if they are in keep-going
+          // mode.
+          // Propagated transitive errors are treated the same as missing deps.
+          if ((!evaluatorContext.keepGoing() || !env.valuesMissing())
+              && reifiedBuilderException.getRootCauseSkyKey().equals(skyKey)) {
+            boolean shouldFailFast =
+                !evaluatorContext.keepGoing() || builderException.isCatastrophic();
+            if (shouldFailFast) {
+              // After we commit this error to the graph but before the doMutatingEvaluation call
+              // completes with the error there is a race-like opportunity for the error to be used,
+              // either by an in-flight computation or by a future computation.
+              if (!evaluatorContext.getVisitor().preventNewEvaluations()) {
+                // This is not the first error encountered, so we ignore it so that we can terminate
+                // with the first error.
+                return;
+              } else {
+                logger.warning(
+                    "Aborting evaluation due to "
+                        + builderException
+                        + " while evaluating "
+                        + skyKey);
+              }
+            }
+
+            Map<SkyKey, ? extends NodeEntry> newlyRequestedDeps =
+                evaluatorContext.getBatchValues(
+                    skyKey, Reason.RDEP_ADDITION, env.getNewlyRequestedDeps());
+            boolean isTransitivelyTransient = reifiedBuilderException.isTransient();
+            for (NodeEntry depEntry :
+                Iterables.concat(env.getDirectDepsValues(), newlyRequestedDeps.values())) {
+              if (!isDoneForBuild(depEntry)) {
+                continue;
+              }
+              ErrorInfo depError = depEntry.getErrorInfo();
+              if (depError != null) {
+                isTransitivelyTransient |= depError.isTransitivelyTransient();
+              }
+            }
+            ErrorInfo errorInfo = evaluatorContext.getErrorInfoManager().fromException(
+                skyKey,
+                reifiedBuilderException,
+                isTransitivelyTransient);
+            registerNewlyDiscoveredDepsForDoneEntry(
+                skyKey, state, newlyRequestedDeps, oldDeps, env);
+            env.setError(state, errorInfo);
+            env.commit(
+                state,
+                evaluatorContext.keepGoing()
+                    ? EnqueueParentBehavior.ENQUEUE
+                    : EnqueueParentBehavior.SIGNAL);
+            if (!shouldFailFast) {
+              return;
+            }
+            throw SchedulerException.ofError(errorInfo, skyKey);
+          }
+        } catch (RuntimeException re) {
+          // Programmer error (most likely NPE or a failed precondition in a SkyFunction). Output
+          // some context together with the exception.
+          String msg = prepareCrashMessage(skyKey, state.getInProgressReverseDeps());
+          RuntimeException ex = new RuntimeException(msg, re);
+          evaluatorContext.getVisitor().noteCrash(ex);
+          throw ex;
+        } finally {
+          env.doneBuilding();
+        }
+
+        GroupedListHelper<SkyKey> newDirectDeps = env.getNewlyRequestedDeps();
+
+        if (value != null) {
+          Preconditions.checkState(
+              !env.valuesMissing(),
+              "Evaluation of %s returned non-null value but requested dependencies that weren't "
+                  + "computed yet (one of %s), NodeEntry: %s",
+              skyKey,
+              newDirectDeps,
+              state);
+          env.setValue(value);
+          registerNewlyDiscoveredDepsForDoneEntry(
+              skyKey,
+              state,
+              graph.getBatch(skyKey, Reason.RDEP_ADDITION, env.getNewlyRequestedDeps()),
+              oldDeps,
+              env);
+          env.commit(state, EnqueueParentBehavior.ENQUEUE);
+          return;
+        }
+
+        if (env.getDepErrorKey() != null) {
+          Preconditions.checkState(
+              !evaluatorContext.keepGoing(), "%s %s %s", skyKey, state, env.getDepErrorKey());
+          // We encountered a child error in noKeepGoing mode, so we want to fail fast. But we first
+          // need to add the edge between the current node and the child error it requested so that
+          // error bubbling can occur. Note that this edge will subsequently be removed during graph
+          // cleaning (since the current node will never be committed to the graph).
+          SkyKey childErrorKey = env.getDepErrorKey();
+          NodeEntry childErrorEntry =
+              Preconditions.checkNotNull(
+                  graph.get(skyKey, Reason.OTHER, childErrorKey),
+                  "skyKey: %s, state: %s childErrorKey: %s",
+                  skyKey,
+                  state,
+                  childErrorKey);
+          if (newDirectDeps.contains(childErrorKey)) {
+            // Add this dep if it was just requested. In certain rare race conditions (see
+            // MemoizingEvaluatorTest.cachedErrorCausesRestart) this dep may have already been
+            // requested.
+            state.addTemporaryDirectDeps(GroupedListHelper.create(childErrorKey));
+            DependencyState childErrorState;
+            if (oldDeps.contains(childErrorKey)) {
+              childErrorState = childErrorEntry.checkIfDoneForDirtyReverseDep(skyKey);
+            } else {
+              childErrorState = childErrorEntry.addReverseDepAndCheckIfDone(skyKey);
+            }
+            Preconditions.checkState(
+                childErrorState == DependencyState.DONE,
+                "skyKey: %s, state: %s childErrorKey: %s",
+                skyKey,
+                state,
+                childErrorKey,
+                childErrorEntry);
+          }
+          ErrorInfo childErrorInfo = Preconditions.checkNotNull(childErrorEntry.getErrorInfo());
+          evaluatorContext.getVisitor().preventNewEvaluations();
+          throw SchedulerException.ofError(childErrorInfo, childErrorKey);
+        }
+
+        // TODO(bazel-team): This code is not safe to interrupt, because we would lose the state in
+        // newDirectDeps.
+
+        // TODO(bazel-team): An ill-behaved SkyFunction can throw us into an infinite loop where we
+        // add more dependencies on every run. [skyframe-core]
+
+        // Add all new keys to the set of known deps.
+        Set<SkyKey> uniqueNewDeps = state.addTemporaryDirectDeps(newDirectDeps);
+
+        // If there were no newly requested dependencies, at least one of them was in error or there
+        // is a bug in the SkyFunction implementation. The environment has collected its errors, so
+        // we just order it to be built.
+        if (uniqueNewDeps.isEmpty()) {
+          // TODO(bazel-team): This means a bug in the SkyFunction. What to do?
+          Preconditions.checkState(
+              !env.getChildErrorInfos().isEmpty(),
+              "Evaluation of SkyKey failed and no dependencies were requested: %s %s",
+              skyKey,
+              state);
+          Preconditions.checkState(
+              evaluatorContext.keepGoing(),
+              "nokeep_going evaluation should have failed on first child error: %s %s %s",
+              skyKey,
+              state,
+              env.getChildErrorInfos());
+          // If the child error was catastrophic, committing this parent to the graph is not
+          // necessary, but since we don't do error bubbling in catastrophes, it doesn't violate any
+          // invariants either.
+          env.commit(state, EnqueueParentBehavior.ENQUEUE);
+          return;
+        }
+
+        for (Entry<SkyKey, ? extends NodeEntry> e :
+            graph.createIfAbsentBatch(skyKey, Reason.ENQUEUING_CHILD, uniqueNewDeps).entrySet()) {
+          SkyKey newDirectDep = e.getKey();
+          NodeEntry newDirectDepEntry = e.getValue();
+          enqueueChild(
+              skyKey,
+              state,
+              newDirectDep,
+              newDirectDepEntry,
+              /*depAlreadyExists=*/ oldDeps.contains(newDirectDep));
+        }
+        // It is critical that there is no code below this point in the try block.
+      } catch (InterruptedException ie) {
+        // InterruptedException cannot be thrown by Runnable.run, so we must wrap it.
+        // Interrupts can be caught by both the Evaluator and the AbstractQueueVisitor.
+        // The former will unwrap the IE and propagate it as is; the latter will throw a new IE.
+        throw SchedulerException.ofInterruption(ie, skyKey);
+      }
+    }
+
+    private String prepareCrashMessage(SkyKey skyKey, Iterable<SkyKey> reverseDeps) {
+      StringBuilder reverseDepDump = new StringBuilder();
+      for (SkyKey key : reverseDeps) {
+        if (reverseDepDump.length() > MAX_REVERSEDEP_DUMP_LENGTH) {
+          reverseDepDump.append(", ...");
+          break;
+        }
+        if (reverseDepDump.length() > 0) {
+          reverseDepDump.append(", ");
+        }
+        reverseDepDump.append("'");
+        reverseDepDump.append(key.toString());
+        reverseDepDump.append("'");
+      }
+
+      return String.format(
+          "Unrecoverable error while evaluating node '%s' (requested by nodes %s)",
+          skyKey, reverseDepDump);
+    }
+
+    private static final int MAX_REVERSEDEP_DUMP_LENGTH = 1000;
+  }
+
+  void propagateEvaluatorContextCrashIfAny() {
+    if (!evaluatorContext.getVisitor().getCrashes().isEmpty()) {
+      evaluatorContext
+          .getReporter()
+          .handle(Event.error("Crashes detected: " + evaluatorContext.getVisitor().getCrashes()));
+      throw Preconditions.checkNotNull(
+          Iterables.getFirst(evaluatorContext.getVisitor().getCrashes(), null));
+    }
+  }
+
+  void propagateInterruption(SchedulerException e) throws InterruptedException {
+    Throwables.propagateIfPossible(e.getCause(), InterruptedException.class);
+    if (Thread.interrupted()) {
+      // As per the contract of AbstractQueueVisitor#work, if an unchecked exception is thrown and
+      // the build is interrupted, the thrown exception is what will be rethrown. Since the user
+      // presumably wanted to interrupt the build, we ignore the thrown SchedulerException (which
+      // doesn't indicate a programming bug) and throw an InterruptedException.
+      throw new InterruptedException();
+    }
+  }
+
+
+  /**
+   * Add any additional deps that were registered during the run of a builder that finished by
+   * creating a node or throwing an error. Builders may throw errors even if all their deps were not
+   * provided -- we trust that a SkyFunction might know it should throw an error even if not all of
+   * its requested deps are done. However, that means we're assuming the SkyFunction would throw
+   * that same error if all of its requested deps were done. Unfortunately, there is no way to
+   * enforce that condition.
+   *
+   * @throws InterruptedException
+   */
+  private static void registerNewlyDiscoveredDepsForDoneEntry(
+      SkyKey skyKey,
+      NodeEntry entry,
+      Map<SkyKey, ? extends NodeEntry> newlyRequestedDepMap,
+      Set<SkyKey> oldDeps,
+      SkyFunctionEnvironment env)
+      throws InterruptedException {
+    Iterator<SkyKey> it = env.getNewlyRequestedDeps().iterator();
+    if (!it.hasNext()) {
+      return;
+    }
+    Set<SkyKey> unfinishedDeps = new HashSet<>();
+    while (it.hasNext()) {
+      SkyKey dep = it.next();
+      if (!isDoneForBuild(newlyRequestedDepMap.get(dep))) {
+        unfinishedDeps.add(dep);
+      }
+    }
+    env.getNewlyRequestedDeps().remove(unfinishedDeps);
+    Set<SkyKey> uniqueNewDeps = entry.addTemporaryDirectDeps(env.getNewlyRequestedDeps());
+    for (SkyKey newDep : uniqueNewDeps) {
+      // Note that this depEntry can't be null. If env.newlyRequestedDeps contained a key with a
+      // null entry, then it would have been added to unfinishedDeps and then removed from
+      // env.newlyRequestedDeps just above this loop.
+      NodeEntry depEntry = Preconditions.checkNotNull(newlyRequestedDepMap.get(newDep), newDep);
+      DependencyState triState =
+          oldDeps.contains(newDep)
+              ? depEntry.checkIfDoneForDirtyReverseDep(skyKey)
+              : depEntry.addReverseDepAndCheckIfDone(skyKey);
+      Preconditions.checkState(DependencyState.DONE == triState,
+          "new dep %s was not already done for %s. ValueEntry: %s. DepValueEntry: %s",
+          newDep, skyKey, entry, depEntry);
+      entry.signalDep();
+    }
+    Preconditions.checkState(
+        entry.isReady(), "%s %s %s", skyKey, entry, env.getNewlyRequestedDeps());
+  }
+
+  /**
+   * Return true if the entry does not need to be re-evaluated this build. The entry will need to be
+   * re-evaluated if it is not done, but also if it was not completely evaluated last build and this
+   * build is keepGoing.
+   */
+  static boolean isDoneForBuild(@Nullable NodeEntry entry) {
+    return entry != null && entry.isDone();
+  }
+}
diff --git a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
index a47a579..b885218 100644
--- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
@@ -13,40 +13,30 @@
 // limitations under the License.
 package com.google.devtools.build.skyframe;
 
-import com.google.common.base.Function;
 import com.google.common.base.Suppliers;
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadCompatible;
-import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.ExtendedEventHandler;
 import com.google.devtools.build.lib.profiler.Profiler;
 import com.google.devtools.build.lib.profiler.ProfilerTask;
-import com.google.devtools.build.lib.util.BlazeClock;
 import com.google.devtools.build.lib.util.GroupedList;
-import com.google.devtools.build.lib.util.GroupedList.GroupedListHelper;
 import com.google.devtools.build.lib.util.Preconditions;
 import com.google.devtools.build.skyframe.EvaluationProgressReceiver.EvaluationState;
 import com.google.devtools.build.skyframe.MemoizingEvaluator.EmittedEventState;
 import com.google.devtools.build.skyframe.NodeEntry.DependencyState;
-import com.google.devtools.build.skyframe.NodeEntry.DirtyState;
-import com.google.devtools.build.skyframe.ParallelEvaluatorContext.EnqueueParentBehavior;
 import com.google.devtools.build.skyframe.QueryableGraph.Reason;
 import com.google.devtools.build.skyframe.SkyFunctionException.ReifiedSkyFunctionException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
-import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
 /**
@@ -59,9 +49,9 @@
  *
  * <p>The basic invariants are:
  *
- * <p>A node can be in one of three states: ready, waiting, and done. A node is ready if and only
- * if all of its dependencies have been signaled. A node is done if it has a value. It is waiting
- * if not all of its dependencies have been signaled.
+ * <p>A node can be in one of three states: ready, waiting, and done. A node is ready if and only if
+ * all of its dependencies have been signaled. A node is done if it has a value. It is waiting if
+ * not all of its dependencies have been signaled.
  *
  * <p>A node must be in the work queue if and only if it is ready. It is an error for a node to be
  * in the work queue twice at the same time.
@@ -74,27 +64,14 @@
  * non-negative {@code long}. The version can also be thought of as an "mtime." Each node in the
  * graph has a version, which is the last version at which its value changed. This version data is
  * used to avoid unnecessary re-evaluation of values. If a node is re-evaluated and found to have
- * the same data as before, its version (mtime) remains the same. If all of a node's children's
- * have the same version as before, its re-evaluation can be skipped.
+ * the same data as before, its version (mtime) remains the same. If all of a node's children's have
+ * the same version as before, its re-evaluation can be skipped.
  *
- * <p>This class is not intended for direct use, and is only exposed as public for use in
- * evaluation implementations outside of this package.
+ * <p>This class is not intended for direct use, and is only exposed as public for use in evaluation
+ * implementations outside of this package.
  */
-public final class ParallelEvaluator implements Evaluator {
-  private static final Logger logger = Logger.getLogger(ParallelEvaluator.class.getName());
+public class ParallelEvaluator extends AbstractParallelEvaluator implements Evaluator {
 
-  private final ProcessableGraph graph;
-
-  /** An general interface for {@link ParallelEvaluator} to receive objects of type {@code T}. */
-  public interface Receiver<T> {
-    // TODO(dmarting): should we just make it a common object for all Bazel codebase?
-    /**
-     * Consumes the given object.
-     */
-    void accept(T object);
-  }
-
-  private final ParallelEvaluatorContext evaluatorContext;
   private final CycleDetector cycleDetector;
 
   public ParallelEvaluator(
@@ -108,20 +85,17 @@
       boolean keepGoing,
       int threadCount,
       DirtyTrackingProgressReceiver progressReceiver) {
-    this.graph = graph;
-    evaluatorContext =
-        new ParallelEvaluatorContext(
-            graph,
-            graphVersion,
-            skyFunctions,
-            reporter,
-            emittedEventState,
-            keepGoing,
-            progressReceiver,
-            storedEventFilter,
-            errorInfoManager,
-            createEvaluateRunnable(),
-            threadCount);
+    super(
+        graph,
+        graphVersion,
+        skyFunctions,
+        reporter,
+        emittedEventState,
+        storedEventFilter,
+        errorInfoManager,
+        keepGoing,
+        threadCount,
+        progressReceiver);
     cycleDetector = new SimpleCycleDetector();
   }
 
@@ -137,529 +111,18 @@
       DirtyTrackingProgressReceiver progressReceiver,
       ForkJoinPool forkJoinPool,
       CycleDetector cycleDetector) {
-    this.graph = graph;
+    super(
+        graph,
+        graphVersion,
+        skyFunctions,
+        reporter,
+        emittedEventState,
+        storedEventFilter,
+        errorInfoManager,
+        keepGoing,
+        progressReceiver,
+        forkJoinPool);
     this.cycleDetector = cycleDetector;
-    evaluatorContext =
-        new ParallelEvaluatorContext(
-            graph,
-            graphVersion,
-            skyFunctions,
-            reporter,
-            emittedEventState,
-            keepGoing,
-            progressReceiver,
-            storedEventFilter,
-            errorInfoManager,
-            createEvaluateRunnable(),
-            Preconditions.checkNotNull(forkJoinPool));
-  }
-
-  /**
-   * Creates a {@link Runnable} that is injected into the {@link NodeEntryVisitor} created on demand
-   * in {@link #evaluatorContext}, so that the visitor can enqueue the appropriate {@link Runnable}
-   * when it is given a {@link SkyKey} to evaluate.
-   */
-  private Function<SkyKey, Runnable> createEvaluateRunnable() {
-    return new Function<SkyKey, Runnable>() {
-      @Override
-      public Runnable apply(SkyKey skyKey) {
-        return new Evaluate(skyKey);
-      }
-    };
-  }
-
-  /**
-   * If the entry is dirty and not already rebuilding, puts it in a state so that it can rebuild.
-   */
-  static void maybeMarkRebuilding(NodeEntry entry) {
-    if (entry.isDirty() && entry.getDirtyState() != DirtyState.REBUILDING) {
-      entry.markRebuilding();
-    }
-  }
-
-  private enum DirtyOutcome {
-    ALREADY_PROCESSED,
-    NEEDS_EVALUATION
-  }
-
-  /**
-   * An action that evaluates a value.
-   */
-  private class Evaluate implements Runnable {
-    /** The name of the value to be evaluated. */
-    private final SkyKey skyKey;
-
-    private Evaluate(SkyKey skyKey) {
-      this.skyKey = skyKey;
-    }
-
-    private void enqueueChild(
-        SkyKey skyKey,
-        NodeEntry entry,
-        SkyKey child,
-        NodeEntry childEntry,
-        boolean depAlreadyExists)
-        throws InterruptedException {
-      Preconditions.checkState(!entry.isDone(), "%s %s", skyKey, entry);
-      DependencyState dependencyState =
-          depAlreadyExists
-              ? childEntry.checkIfDoneForDirtyReverseDep(skyKey)
-              : childEntry.addReverseDepAndCheckIfDone(skyKey);
-      switch (dependencyState) {
-        case DONE:
-          if (entry.signalDep(childEntry.getVersion())) {
-            // This can only happen if there are no more children to be added.
-            evaluatorContext.getVisitor().enqueueEvaluation(skyKey);
-          }
-          break;
-        case ALREADY_EVALUATING:
-          break;
-        case NEEDS_SCHEDULING:
-          evaluatorContext.getVisitor().enqueueEvaluation(child);
-          break;
-      }
-    }
-
-    /**
-     * Returns true if this depGroup consists of the error transience value and the error transience
-     * value is newer than the entry, meaning that the entry must be re-evaluated.
-     */
-    private boolean invalidatedByErrorTransience(Collection<SkyKey> depGroup, NodeEntry entry)
-        throws InterruptedException {
-      return depGroup.size() == 1
-          && depGroup.contains(ErrorTransienceValue.KEY)
-          && !graph.get(
-              null, Reason.OTHER, ErrorTransienceValue.KEY).getVersion().atMost(entry.getVersion());
-    }
-
-    private DirtyOutcome maybeHandleDirtyNode(NodeEntry state) throws InterruptedException {
-      if (!state.isDirty()) {
-        return DirtyOutcome.NEEDS_EVALUATION;
-      }
-      while (state.getDirtyState().equals(DirtyState.CHECK_DEPENDENCIES)) {
-        // Evaluating a dirty node for the first time, and checking its children to see if any
-        // of them have changed. Note that there must be dirty children for this to happen.
-
-        // Check the children group by group -- we don't want to evaluate a value that is no
-        // longer needed because an earlier dependency changed. For example, //foo:foo depends
-        // on target //bar:bar and is built. Then foo/BUILD is modified to remove the dependence
-        // on bar, and bar/BUILD is deleted. Reloading //bar:bar would incorrectly throw an
-        // exception. To avoid this, we must reload foo/BUILD first, at which point we will
-        // discover that it has changed, and re-evaluate target //foo:foo from scratch.
-        // On the other hand, when an action requests all of its inputs, we can safely check all
-        // of them in parallel on a subsequent build. So we allow checking an entire group in
-        // parallel here, if the node builder requested a group last build.
-        // Note: every dep returned here must either have this node re-registered for it (using
-        // checkIfDoneForDirtyReverseDep) and be registered as a direct dep of this node, or have
-        // its reverse dep on this node removed. Failing to do either one of these would result in
-        // a graph inconsistency, where the child had a reverse dep on this node, but this node
-        // had no kind of dependency on the child.
-        Collection<SkyKey> directDepsToCheck = state.getNextDirtyDirectDeps();
-
-        if (invalidatedByErrorTransience(directDepsToCheck, state)) {
-          // If this dep is the ErrorTransienceValue and the ErrorTransienceValue has been
-          // updated then we need to force a rebuild. We would like to just signal the entry as
-          // usual, but we can't, because then the ErrorTransienceValue would remain as a dep,
-          // which would be incorrect if, for instance, the value re-evaluated to a non-error.
-          state.forceRebuild();
-          graph.get(skyKey, Reason.RDEP_REMOVAL, ErrorTransienceValue.KEY).removeReverseDep(skyKey);
-          return DirtyOutcome.NEEDS_EVALUATION;
-        }
-        if (!evaluatorContext.keepGoing()) {
-          // This check ensures that we maintain the invariant that if a node with an error is
-          // reached during a no-keep-going build, none of its currently building parents
-          // finishes building. If the child isn't done building yet, it will detect on its own
-          // that it has an error (see the VERIFIED_CLEAN case below). On the other hand, if it
-          // is done, then it is the parent's responsibility to notice that, which we do here.
-          // We check the deps for errors so that we don't continue building this node if it has
-          // a child error.
-          Map<SkyKey, ? extends NodeEntry> entriesToCheck =
-              graph.getBatch(skyKey, Reason.OTHER, directDepsToCheck);
-          for (Entry<SkyKey, ? extends NodeEntry> entry : entriesToCheck.entrySet()) {
-            if (entry.getValue().isDone() && entry.getValue().getErrorInfo() != null) {
-              // If any child has an error, we arbitrarily add a dep on the first one (needed
-              // for error bubbling) and throw an exception coming from it.
-              SkyKey errorKey = entry.getKey();
-              NodeEntry errorEntry = entry.getValue();
-              state.addTemporaryDirectDeps(GroupedListHelper.create(errorKey));
-              errorEntry.checkIfDoneForDirtyReverseDep(skyKey);
-              // Perform the necessary bookkeeping for any deps that are not being used.
-              for (Entry<SkyKey, ? extends NodeEntry> depEntry : entriesToCheck.entrySet()) {
-                if (!depEntry.getKey().equals(errorKey)) {
-                  depEntry.getValue().removeReverseDep(skyKey);
-                }
-              }
-              if (!evaluatorContext.getVisitor().preventNewEvaluations()) {
-                // An error was already thrown in the evaluator. Don't do anything here.
-                return DirtyOutcome.ALREADY_PROCESSED;
-              }
-              throw SchedulerException.ofError(errorEntry.getErrorInfo(), entry.getKey());
-            }
-          }
-        }
-        // It is safe to add these deps back to the node -- even if one of them has changed, the
-        // contract of pruning is that the node will request these deps again when it rebuilds.
-        // We must add these deps before enqueuing them, so that the node knows that it depends
-        // on them. If one of these deps is the error transience node, the check we did above
-        // in #invalidatedByErrorTransience means that the error transience node is not newer
-        // than this node, so we are going to mark it clean (since the error transience node is
-        // always the last dep).
-        state.addTemporaryDirectDepsGroupToDirtyEntry(directDepsToCheck);
-        DepsReport depsReport = graph.analyzeDepsDoneness(skyKey, directDepsToCheck);
-        Collection<SkyKey> unknownStatusDeps =
-            depsReport.hasInformation() ? depsReport : directDepsToCheck;
-        boolean needsScheduling = false;
-        for (int i = 0; i < directDepsToCheck.size() - unknownStatusDeps.size(); i++) {
-          // Since all of these nodes were done at an earlier version than this one, we may safely
-          // signal with the minimal version, since they cannot trigger a re-evaluation.
-          needsScheduling = state.signalDep(MinimalVersion.INSTANCE);
-        }
-        if (needsScheduling) {
-          Preconditions.checkState(
-              unknownStatusDeps.isEmpty(),
-              "Ready without all deps checked? %s %s %s",
-              skyKey,
-              state,
-              unknownStatusDeps);
-          continue;
-        }
-        Map<SkyKey, ? extends NodeEntry> oldChildren =
-            graph.getBatch(skyKey, Reason.ENQUEUING_CHILD, unknownStatusDeps);
-        Preconditions.checkState(
-            oldChildren.size() == unknownStatusDeps.size(),
-            "Not all old children were present: %s %s %s %s %s",
-            skyKey,
-            state,
-            unknownStatusDeps,
-            oldChildren,
-            directDepsToCheck);
-        for (Map.Entry<SkyKey, ? extends NodeEntry> e : oldChildren.entrySet()) {
-          SkyKey directDep = e.getKey();
-          NodeEntry directDepEntry = e.getValue();
-          // TODO(bazel-team): If this signals the current node, consider falling through to the
-          // VERIFIED_CLEAN case below directly, without scheduling a new Evaluate().
-          enqueueChild(skyKey, state, directDep, directDepEntry, /*depAlreadyExists=*/ true);
-        }
-        return DirtyOutcome.ALREADY_PROCESSED;
-      }
-      switch (state.getDirtyState()) {
-        case VERIFIED_CLEAN:
-          // No child has a changed value. This node can be marked done and its parents signaled
-          // without any re-evaluation.
-          Set<SkyKey> reverseDeps = state.markClean();
-          // Tell the receiver that the value was not actually changed this run.
-          evaluatorContext.getProgressReceiver()
-                .evaluated(skyKey, new SkyValueSupplier(state), EvaluationState.CLEAN);
-          if (!evaluatorContext.keepGoing() && state.getErrorInfo() != null) {
-            if (!evaluatorContext.getVisitor().preventNewEvaluations()) {
-              return DirtyOutcome.ALREADY_PROCESSED;
-            }
-            throw SchedulerException.ofError(state.getErrorInfo(), skyKey);
-          }
-          evaluatorContext.signalValuesAndEnqueueIfReady(
-              skyKey, reverseDeps, state.getVersion(), EnqueueParentBehavior.ENQUEUE);
-          return DirtyOutcome.ALREADY_PROCESSED;
-        case NEEDS_REBUILDING:
-          maybeMarkRebuilding(state);
-          // Fall through to REBUILDING case.
-        case REBUILDING:
-          return DirtyOutcome.NEEDS_EVALUATION;
-        default:
-          throw new IllegalStateException("key: " + skyKey + ", entry: " + state);
-      }
-    }
-
-    @Override
-    public void run() {
-      try {
-        NodeEntry state =
-            Preconditions.checkNotNull(graph.get(null, Reason.EVALUATION, skyKey), skyKey);
-        Preconditions.checkState(state.isReady(), "%s %s", skyKey, state);
-        if (maybeHandleDirtyNode(state) == DirtyOutcome.ALREADY_PROCESSED) {
-          return;
-        }
-
-        Set<SkyKey> oldDeps = state.getAllRemainingDirtyDirectDeps();
-        SkyFunctionEnvironment env =
-            new SkyFunctionEnvironment(
-                skyKey, state.getTemporaryDirectDeps(), oldDeps, evaluatorContext);
-        SkyFunctionName functionName = skyKey.functionName();
-        SkyFunction factory =
-            Preconditions.checkNotNull(
-                evaluatorContext.getSkyFunctions().get(functionName),
-                "Unable to find SkyFunction '%s' for node with key %s, %s",
-                functionName,
-                skyKey,
-                state);
-
-        SkyValue value = null;
-        long startTime = BlazeClock.instance().nanoTime();
-        try {
-          try {
-            evaluatorContext.getProgressReceiver().computing(skyKey);
-            value = factory.compute(skyKey, env);
-          } finally {
-            long elapsedTimeNanos = BlazeClock.instance().nanoTime() - startTime;
-            if (elapsedTimeNanos > 0) {
-              evaluatorContext.getProgressReceiver().computed(skyKey, elapsedTimeNanos);
-              Profiler.instance()
-                  .logSimpleTaskDuration(
-                      startTime, elapsedTimeNanos, ProfilerTask.SKYFUNCTION, skyKey);
-            }
-          }
-        } catch (final SkyFunctionException builderException) {
-          ReifiedSkyFunctionException reifiedBuilderException =
-              new ReifiedSkyFunctionException(builderException, skyKey);
-          // In keep-going mode, we do not let SkyFunctions throw errors with missing deps -- we
-          // will restart them when their deps are done, so we can have a definitive error and
-          // definitive graph structure, thus avoiding non-determinism. It's completely reasonable
-          // for SkyFunctions to throw eagerly because they do not know if they are in keep-going
-          // mode.
-          // Propagated transitive errors are treated the same as missing deps.
-          if ((!evaluatorContext.keepGoing() || !env.valuesMissing())
-              && reifiedBuilderException.getRootCauseSkyKey().equals(skyKey)) {
-            boolean shouldFailFast =
-                !evaluatorContext.keepGoing() || builderException.isCatastrophic();
-            if (shouldFailFast) {
-              // After we commit this error to the graph but before the doMutatingEvaluation call
-              // completes with the error there is a race-like opportunity for the error to be used,
-              // either by an in-flight computation or by a future computation.
-              if (!evaluatorContext.getVisitor().preventNewEvaluations()) {
-                // This is not the first error encountered, so we ignore it so that we can terminate
-                // with the first error.
-                return;
-              } else {
-                logger.warning(
-                    "Aborting evaluation due to "
-                        + builderException
-                        + " while evaluating "
-                        + skyKey);
-              }
-            }
-
-            Map<SkyKey, ? extends NodeEntry> newlyRequestedDeps =
-                evaluatorContext.getBatchValues(
-                    skyKey, Reason.RDEP_ADDITION, env.getNewlyRequestedDeps());
-            boolean isTransitivelyTransient = reifiedBuilderException.isTransient();
-            for (NodeEntry depEntry :
-                Iterables.concat(env.getDirectDepsValues(), newlyRequestedDeps.values())) {
-              if (!isDoneForBuild(depEntry)) {
-                continue;
-              }
-              ErrorInfo depError = depEntry.getErrorInfo();
-              if (depError != null) {
-                isTransitivelyTransient |= depError.isTransitivelyTransient();
-              }
-            }
-            ErrorInfo errorInfo = evaluatorContext.getErrorInfoManager().fromException(
-                skyKey,
-                reifiedBuilderException,
-                isTransitivelyTransient);
-            registerNewlyDiscoveredDepsForDoneEntry(
-                skyKey, state, newlyRequestedDeps, oldDeps, env);
-            env.setError(state, errorInfo);
-            env.commit(
-                state,
-                evaluatorContext.keepGoing()
-                    ? EnqueueParentBehavior.ENQUEUE
-                    : EnqueueParentBehavior.SIGNAL);
-            if (!shouldFailFast) {
-              return;
-            }
-            throw SchedulerException.ofError(errorInfo, skyKey);
-          }
-        } catch (RuntimeException re) {
-          // Programmer error (most likely NPE or a failed precondition in a SkyFunction). Output
-          // some context together with the exception.
-          String msg = prepareCrashMessage(skyKey, state.getInProgressReverseDeps());
-          RuntimeException ex = new RuntimeException(msg, re);
-          evaluatorContext.getVisitor().noteCrash(ex);
-          throw ex;
-        } finally {
-          env.doneBuilding();
-        }
-
-        GroupedListHelper<SkyKey> newDirectDeps = env.getNewlyRequestedDeps();
-
-        if (value != null) {
-          Preconditions.checkState(
-              !env.valuesMissing(),
-              "Evaluation of %s returned non-null value but requested dependencies that weren't "
-                  + "computed yet (one of %s), NodeEntry: %s",
-              skyKey,
-              newDirectDeps,
-              state);
-          env.setValue(value);
-          registerNewlyDiscoveredDepsForDoneEntry(
-              skyKey,
-              state,
-              graph.getBatch(skyKey, Reason.RDEP_ADDITION, env.getNewlyRequestedDeps()),
-              oldDeps,
-              env);
-          env.commit(state, EnqueueParentBehavior.ENQUEUE);
-          return;
-        }
-
-        if (env.getDepErrorKey() != null) {
-          Preconditions.checkState(
-              !evaluatorContext.keepGoing(), "%s %s %s", skyKey, state, env.getDepErrorKey());
-          // We encountered a child error in noKeepGoing mode, so we want to fail fast. But we first
-          // need to add the edge between the current node and the child error it requested so that
-          // error bubbling can occur. Note that this edge will subsequently be removed during graph
-          // cleaning (since the current node will never be committed to the graph).
-          SkyKey childErrorKey = env.getDepErrorKey();
-          NodeEntry childErrorEntry =
-              Preconditions.checkNotNull(
-                  graph.get(skyKey, Reason.OTHER, childErrorKey),
-                  "skyKey: %s, state: %s childErrorKey: %s",
-                  skyKey,
-                  state,
-                  childErrorKey);
-          if (newDirectDeps.contains(childErrorKey)) {
-            // Add this dep if it was just requested. In certain rare race conditions (see
-            // MemoizingEvaluatorTest.cachedErrorCausesRestart) this dep may have already been
-            // requested.
-            state.addTemporaryDirectDeps(GroupedListHelper.create(childErrorKey));
-            DependencyState childErrorState;
-            if (oldDeps.contains(childErrorKey)) {
-              childErrorState = childErrorEntry.checkIfDoneForDirtyReverseDep(skyKey);
-            } else {
-              childErrorState = childErrorEntry.addReverseDepAndCheckIfDone(skyKey);
-            }
-            Preconditions.checkState(
-                childErrorState == DependencyState.DONE,
-                "skyKey: %s, state: %s childErrorKey: %s",
-                skyKey,
-                state,
-                childErrorKey,
-                childErrorEntry);
-          }
-          ErrorInfo childErrorInfo = Preconditions.checkNotNull(childErrorEntry.getErrorInfo());
-          evaluatorContext.getVisitor().preventNewEvaluations();
-          throw SchedulerException.ofError(childErrorInfo, childErrorKey);
-        }
-
-        // TODO(bazel-team): This code is not safe to interrupt, because we would lose the state in
-        // newDirectDeps.
-
-        // TODO(bazel-team): An ill-behaved SkyFunction can throw us into an infinite loop where we
-        // add more dependencies on every run. [skyframe-core]
-
-        // Add all new keys to the set of known deps.
-        Set<SkyKey> uniqueNewDeps = state.addTemporaryDirectDeps(newDirectDeps);
-
-        // If there were no newly requested dependencies, at least one of them was in error or there
-        // is a bug in the SkyFunction implementation. The environment has collected its errors, so
-        // we just order it to be built.
-        if (uniqueNewDeps.isEmpty()) {
-          // TODO(bazel-team): This means a bug in the SkyFunction. What to do?
-          Preconditions.checkState(
-              !env.getChildErrorInfos().isEmpty(),
-              "Evaluation of SkyKey failed and no dependencies were requested: %s %s",
-              skyKey,
-              state);
-          Preconditions.checkState(
-              evaluatorContext.keepGoing(),
-              "nokeep_going evaluation should have failed on first child error: %s %s %s",
-              skyKey,
-              state,
-              env.getChildErrorInfos());
-          // If the child error was catastrophic, committing this parent to the graph is not
-          // necessary, but since we don't do error bubbling in catastrophes, it doesn't violate any
-          // invariants either.
-          env.commit(state, EnqueueParentBehavior.ENQUEUE);
-          return;
-        }
-
-        for (Entry<SkyKey, ? extends NodeEntry> e :
-            graph.createIfAbsentBatch(skyKey, Reason.ENQUEUING_CHILD, uniqueNewDeps).entrySet()) {
-          SkyKey newDirectDep = e.getKey();
-          NodeEntry newDirectDepEntry = e.getValue();
-          enqueueChild(
-              skyKey,
-              state,
-              newDirectDep,
-              newDirectDepEntry,
-              /*depAlreadyExists=*/ oldDeps.contains(newDirectDep));
-        }
-        // It is critical that there is no code below this point in the try block.
-      } catch (InterruptedException ie) {
-        // InterruptedException cannot be thrown by Runnable.run, so we must wrap it.
-        // Interrupts can be caught by both the Evaluator and the AbstractQueueVisitor.
-        // The former will unwrap the IE and propagate it as is; the latter will throw a new IE.
-        throw SchedulerException.ofInterruption(ie, skyKey);
-      }
-    }
-
-    private String prepareCrashMessage(SkyKey skyKey, Iterable<SkyKey> reverseDeps) {
-      StringBuilder reverseDepDump = new StringBuilder();
-      for (SkyKey key : reverseDeps) {
-        if (reverseDepDump.length() > MAX_REVERSEDEP_DUMP_LENGTH) {
-          reverseDepDump.append(", ...");
-          break;
-        }
-        if (reverseDepDump.length() > 0) {
-          reverseDepDump.append(", ");
-        }
-        reverseDepDump.append("'");
-        reverseDepDump.append(key.toString());
-        reverseDepDump.append("'");
-      }
-
-      return String.format(
-          "Unrecoverable error while evaluating node '%s' (requested by nodes %s)",
-          skyKey, reverseDepDump);
-    }
-
-    private static final int MAX_REVERSEDEP_DUMP_LENGTH = 1000;
-  }
-
-  /**
-   * Add any additional deps that were registered during the run of a builder that finished by
-   * creating a node or throwing an error. Builders may throw errors even if all their deps were not
-   * provided -- we trust that a SkyFunction might know it should throw an error even if not all of
-   * its requested deps are done. However, that means we're assuming the SkyFunction would throw
-   * that same error if all of its requested deps were done. Unfortunately, there is no way to
-   * enforce that condition.
-   *
-   * @throws InterruptedException
-   */
-  private static void registerNewlyDiscoveredDepsForDoneEntry(
-      SkyKey skyKey,
-      NodeEntry entry,
-      Map<SkyKey, ? extends NodeEntry> newlyRequestedDepMap,
-      Set<SkyKey> oldDeps,
-      SkyFunctionEnvironment env)
-      throws InterruptedException {
-    Iterator<SkyKey> it = env.getNewlyRequestedDeps().iterator();
-    if (!it.hasNext()) {
-      return;
-    }
-    Set<SkyKey> unfinishedDeps = new HashSet<>();
-    while (it.hasNext()) {
-      SkyKey dep = it.next();
-      if (!isDoneForBuild(newlyRequestedDepMap.get(dep))) {
-        unfinishedDeps.add(dep);
-      }
-    }
-    env.getNewlyRequestedDeps().remove(unfinishedDeps);
-    Set<SkyKey> uniqueNewDeps = entry.addTemporaryDirectDeps(env.getNewlyRequestedDeps());
-    for (SkyKey newDep : uniqueNewDeps) {
-      // Note that this depEntry can't be null. If env.newlyRequestedDeps contained a key with a
-      // null entry, then it would have been added to unfinishedDeps and then removed from
-      // env.newlyRequestedDeps just above this loop.
-      NodeEntry depEntry = Preconditions.checkNotNull(newlyRequestedDepMap.get(newDep), newDep);
-      DependencyState triState =
-          oldDeps.contains(newDep)
-              ? depEntry.checkIfDoneForDirtyReverseDep(skyKey)
-              : depEntry.addReverseDepAndCheckIfDone(skyKey);
-      Preconditions.checkState(DependencyState.DONE == triState,
-          "new dep %s was not already done for %s. ValueEntry: %s. DepValueEntry: %s",
-          newDep, skyKey, entry, depEntry);
-      entry.signalDep();
-    }
-    Preconditions.checkState(
-        entry.isReady(), "%s %s %s", skyKey, entry, env.getNewlyRequestedDeps());
   }
 
   private void informProgressReceiverThatValueIsDone(SkyKey key, NodeEntry entry)
@@ -760,13 +223,15 @@
     // We unconditionally add the ErrorTransienceValue here, to ensure that it will be created, and
     // in the graph, by the time that it is needed. Creating it on demand in a parallel context sets
     // up a race condition, because there is no way to atomically create a node and set its value.
-    NodeEntry errorTransienceEntry = Iterables.getOnlyElement(graph.createIfAbsentBatch(
-            null,
-            Reason.PRE_OR_POST_EVALUATION,
-            ImmutableList.of(ErrorTransienceValue.KEY)).values());
+    NodeEntry errorTransienceEntry =
+        Iterables.getOnlyElement(
+            graph
+                .createIfAbsentBatch(
+                    null, Reason.PRE_OR_POST_EVALUATION, ImmutableList.of(ErrorTransienceValue.KEY))
+                .values());
     if (!errorTransienceEntry.isDone()) {
       injectValues(
-          ImmutableMap.of(ErrorTransienceValue.KEY, (SkyValue) ErrorTransienceValue.INSTANCE),
+          ImmutableMap.of(ErrorTransienceValue.KEY, ErrorTransienceValue.INSTANCE),
           evaluatorContext.getGraphVersion(),
           graph,
           evaluatorContext.getProgressReceiver());
@@ -799,21 +264,8 @@
     try {
       evaluatorContext.getVisitor().waitForCompletion();
     } catch (final SchedulerException e) {
-      if (!evaluatorContext.getVisitor().getCrashes().isEmpty()) {
-        evaluatorContext
-            .getReporter()
-            .handle(Event.error("Crashes detected: " + evaluatorContext.getVisitor().getCrashes()));
-        throw Iterables.getFirst(evaluatorContext.getVisitor().getCrashes(), null);
-      }
-      Throwables.propagateIfPossible(e.getCause(), InterruptedException.class);
-      if (Thread.interrupted()) {
-        // As per the contract of AbstractQueueVisitor#work, if an unchecked exception is thrown and
-        // the build is interrupted, the thrown exception is what will be rethrown. Since the user
-        // presumably wanted to interrupt the build, we ignore the thrown SchedulerException (which
-        // doesn't indicate a programming bug) and throw an InterruptedException.
-        throw new InterruptedException();
-      }
-
+      propagateEvaluatorContextCrashIfAny();
+      propagateInterruption(e);
       SkyKey errorKey = Preconditions.checkNotNull(e.getFailedValue(), e);
       // ErrorInfo could only be null if SchedulerException wrapped an InterruptedException, but
       // that should have been propagated.
@@ -1153,15 +605,6 @@
     return isDoneForBuild(entry) ? entry.getValueMaybeWithMetadata() : null;
   }
 
-  /**
-   * Return true if the entry does not need to be re-evaluated this build. The entry will need to be
-   * re-evaluated if it is not done, but also if it was not completely evaluated last build and this
-   * build is keepGoing.
-   */
-  static boolean isDoneForBuild(@Nullable NodeEntry entry) {
-    return entry != null && entry.isDone();
-  }
-
   static void injectValues(
       Map<SkyKey, SkyValue> injectionMap,
       Version version,
diff --git a/src/main/java/com/google/devtools/build/skyframe/SimpleCycleDetector.java b/src/main/java/com/google/devtools/build/skyframe/SimpleCycleDetector.java
index 4a8acc1..b62a1d0 100644
--- a/src/main/java/com/google/devtools/build/skyframe/SimpleCycleDetector.java
+++ b/src/main/java/com/google/devtools/build/skyframe/SimpleCycleDetector.java
@@ -13,8 +13,8 @@
 // limitations under the License.
 package com.google.devtools.build.skyframe;
 
-import static com.google.devtools.build.skyframe.ParallelEvaluator.isDoneForBuild;
-import static com.google.devtools.build.skyframe.ParallelEvaluator.maybeMarkRebuilding;
+import static com.google.devtools.build.skyframe.AbstractParallelEvaluator.isDoneForBuild;
+import static com.google.devtools.build.skyframe.AbstractParallelEvaluator.maybeMarkRebuilding;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableMap;
diff --git a/src/main/java/com/google/devtools/build/skyframe/SkyFunctionEnvironment.java b/src/main/java/com/google/devtools/build/skyframe/SkyFunctionEnvironment.java
index 8735f34..96915bf 100644
--- a/src/main/java/com/google/devtools/build/skyframe/SkyFunctionEnvironment.java
+++ b/src/main/java/com/google/devtools/build/skyframe/SkyFunctionEnvironment.java
@@ -13,7 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.skyframe;
 
-import static com.google.devtools.build.skyframe.ParallelEvaluator.isDoneForBuild;
+import static com.google.devtools.build.skyframe.AbstractParallelEvaluator.isDoneForBuild;
 import static com.google.devtools.build.skyframe.ParallelEvaluator.maybeGetValueFromError;
 
 import com.google.common.base.Function;