commit b07cd0648bc01d41e6e3dff8b8b5349ccc77c459
author nharmata <nharmata@google.com> Tue Feb 19 09:52:50 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Feb 19 09:54:43 2019 -0800
tree 1bae12d41a57a4df7882e818051f23c4a5a5601f
parent 68c7e5a3c679be51f750d44aae146007f0f04b4d

Logical rollforward of https://github.com/bazelbuild/bazel/commit/e2e235359ccdc4b6a122586b9d7c99abbddd65f5. That commit was reverted because it tickled an unrelated bug accidentally exercised by a Google-internal test.

The unrelated bug has been fixed separately.

RELNOTES: None
PiperOrigin-RevId: 234620238

src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java
index 0f0aaa6..6f02026 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/FileFunction.java
@@ -117,17 +117,6 @@
     RootedPath realRootedPath = rootedPathFromAncestors;
     FileStateValue realFileStateValue = fileStateValueFromAncestors;
 
-    FileStateValue fileStateValue;
-    if (rootedPath.equals(realRootedPath)) {
-      fileStateValue = Preconditions.checkNotNull(realFileStateValue, rootedPath);
-    } else {
-      // TODO(b/123922036): Yep, this is useless & wasted work.
-      fileStateValue = (FileStateValue) env.getValue(FileStateValue.key(rootedPath));
-      if (fileStateValue == null) {
-        return null;
-      }
-    }
-
     while (realFileStateValue.getType().isSymlink()) {
       PartialResolutionResult getSymlinkTargetRootedPathResult =
           getSymlinkTargetRootedPath(
@@ -147,7 +136,7 @@
         ImmutableList.copyOf(logicalChain),
         rootedPath,
         // TODO(b/123922036): This is a bug. Should be 'fileStateValueFromAncestors'.
-        fileStateValue,
+        fileStateValueFromAncestors,
         realRootedPath,
         realFileStateValue);
   }