Don't be unnecessarily conservative about marking FileStateKeys and DirectoryListingStateKeys as dirty. Note that the two previous "concerns" of cycles and errors (which weren't actually concerns) are now obsolete anyway.

--
MOS_MIGRATED_REVID=95441624

1 files changed, 5 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java b/src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java
index 735a5e64ae..2ab75476ec 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/FilesystemValueChecker.java
@@ -308,15 +308,11 @@ class FilesystemValueChecker {
       executor.execute(wrapper.wrap(new Runnable() {
         @Override
         public void run() {
-          if (value == null) {
-            // value will be null if the value is in error or part of a cycle.
-            // TODO(bazel-team): This is overly conservative.
-            batchResult.add(key, /*newValue=*/null);
-            return;
-          }
-          DirtyResult result = checker.check(key, value, tsgm);
-          if (result.isDirty()) {
-            batchResult.add(key, result.getNewValue());
+          if (value != null) {
+            DirtyResult result = checker.check(key, value, tsgm);
+            if (result.isDirty()) {
+              batchResult.add(key, result.getNewValue());
+            }
           }
         }
       }));