diff options
Diffstat (limited to 'src/main/java/com/google')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java | 10 |
2 files changed, 1 insertions, 11 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 364f9957b3..1cd9c2b841 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 @@ -497,7 +497,7 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { // Some blaze commands don't include the view options. Don't bother with them. return; } - if (batch && viewOptions.keepGoing && viewOptions.discardAnalysisCache) { + if (batch && viewOptions.discardAnalysisCache) { Preconditions.checkState( incrementalState == IncrementalState.NORMAL, "May only be called once if successful: %s", 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 4737a6ec23..54b0d02581 100644 --- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java +++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java @@ -199,16 +199,6 @@ public class ParallelEvaluator extends AbstractParallelEvaluator implements Eval } } - // We delay this check until we know that some kind of evaluation is necessary, since !keepGoing - // and !keepsEdges are incompatible only in the case of a failed evaluation -- there is no - // need to be overly harsh to callers who are just trying to retrieve a cached result. - Preconditions.checkState( - evaluatorContext.keepGoing() - || !(graph instanceof InMemoryGraphImpl) - || ((InMemoryGraphImpl) graph).keepsEdges(), - "nokeep_going evaluations are not allowed if graph edges are not kept: %s", - skyKeys); - Profiler.instance().startTask(ProfilerTask.SKYFRAME_EVAL, skyKeySet); try { return doMutatingEvaluation(skyKeySet); |