commit 6c5ef5369a3ffceb8a65cc159a2fff1401242810
author lberki <lberki@google.com> Fri Aug 02 03:54:58 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Aug 02 03:55:47 2019 -0700
tree b9bd12ab6b0d4ec7bacfdec9c721d4eefcd2db6f
parent 5f2b55224d7ee04d72208d9e297198ef8232f93b

Do not assert that all TreeFileArtifacts have RegularFileValues.

This apparently happens for the root directory of TreeArtifacts on OS X for some odd reason.

Fixes #9054.

RELNOTES: None.
PiperOrigin-RevId: 261295961

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java
index 4de2fbb..8fc7407 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java
@@ -85,16 +85,16 @@
     for (Map.Entry<Artifact, TreeArtifactValue> tree : treeArtifactData.entrySet()) {
       for (Map.Entry<TreeFileArtifact, FileArtifactValue> file :
           tree.getValue().getChildValues().entrySet()) {
-        Preconditions.checkArgument(
-            file.getValue().getType() == FileStateType.REGULAR_FILE,
-            "file %s in tree artifact %s is not a regular file",
-            file.getKey(),
-            tree.getKey());
-        Preconditions.checkArgument(
-            file.getValue().getDigest() != null,
-            "missing digest for file %s in tree artifact %s",
-            file.getKey(),
-            tree.getKey());
+        // We should only have RegularFileValue instances in here, but apparently tree artifacts
+        // sometimes store their own root directory in here. Sad.
+        // https://github.com/bazelbuild/bazel/issues/9058
+        if (file.getValue().getType() == FileStateType.REGULAR_FILE) {
+          Preconditions.checkArgument(
+              file.getValue().getDigest() != null,
+              "missing digest for file %s in tree artifact %s",
+              file.getKey(),
+              tree.getKey());
+        }
       }
     }