diff options
Diffstat (limited to 'src/main/java/com/google/devtools')
-rw-r--r-- | src/main/java/com/google/devtools/build/skyframe/BuildingState.java | 10 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/skyframe/BuildingState.java b/src/main/java/com/google/devtools/build/skyframe/BuildingState.java index 9de91be05d..2804ecd39d 100644 --- a/src/main/java/com/google/devtools/build/skyframe/BuildingState.java +++ b/src/main/java/com/google/devtools/build/skyframe/BuildingState.java @@ -300,16 +300,18 @@ public class BuildingState { } /** - * Returns true if {@code newValue}.equals the value from the last time this node was built, and - * the deps requested during this evaluation are exactly those requested the last time this node - * was built, in the same order. Should only be used by {@link NodeEntry#setValue}. + * Returns true if {@code newValue}.equals the value from the last time this node was built. + * Should only be used by {@link NodeEntry#setValue}. + * + * <p>Changes in direct deps do <i>not</i> force this to return false. Only the value is + * considered. */ boolean unchangedFromLastBuild(SkyValue newValue) { checkFinishedBuildingWhenAboutToSetValue(); if (newValue instanceof NotComparableSkyValue) { return false; } - return getLastBuildValue().equals(newValue) && lastBuildDirectDeps.equals(directDeps); + return getLastBuildValue().equals(newValue); } /** diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java index c23b8222d7..7b885b8ebd 100644 --- a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java +++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java @@ -54,10 +54,10 @@ public class InMemoryNodeEntry implements NodeEntry { private SkyValue value = null; /** - * The last version of the graph at which this node entry was changed. In {@link #setValue} it - * may be determined that the data being written to the graph at a given version is the same as - * the already-stored data. In that case, the version will remain the same. The version can be - * thought of as the latest timestamp at which this entry was changed. + * The last version of the graph at which this node's value was changed. In {@link #setValue} it + * may be determined that the value being written to the graph at a given version is the same as + * the already-stored value. In that case, the version will remain the same. The version can be + * thought of as the latest timestamp at which this value was changed. */ protected Version lastChangedVersion = MinimalVersion.INSTANCE; |