diff options
| author |  Janak Ramakrishnan <janakr@google.com> | 2015-11-23 16:48:42 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2015-11-24 14:40:57 +0000 |
| commit | 1daf935a369c7fe70c425223163be1b6deb8302b (patch) | |
| tree | c3dc64c8af367943b365bcb103176491dfa9b729 /src/main/java/com/google/devtools/build | |
| parent | 021a3657b5dfed6961ec18586b1bdcfebd693f95 (diff) | |
Tolerate independent cycle underneath main cycle during a re-evaluation.
With the new-ish behavior of change pruning, where nodes transition from NEEDS_REBUILDING to REBUILDING, we need to make that transition unconditionally for dirty nodes -- being ready after unfinished deps were removed is irrelevant.
--
MOS_MIGRATED_REVID=108508979
Diffstat (limited to 'src/main/java/com/google/devtools/build')
| -rw-r--r-- | src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 7706611734..802e940f69 100644 --- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java +++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java @@ -1801,8 +1801,8 @@ public final class ParallelEvaluator implements Evaluator { // that the entry can conceivably be ready if its cycleChild already found a different cycle // and was built. entry.signalDep(); - maybeMarkRebuildingAndRemoveRemainingDirtyDirectDeps(key, entry); } + maybeMarkRebuildingAndRemoveRemainingDirtyDirectDeps(key, entry); Preconditions.checkState(entry.isReady(), "%s %s %s", key, cycleChild, entry); Iterator<SkyKey> it = toVisit.iterator(); while (it.hasNext()) { |