1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java
index ae5231a95e..312feefcef 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java
@@ -76,7 +76,9 @@ class ArtifactFunction implements SkyFunction {
       return null;
     }
 
-    if (!isAggregatingValue(action)) {
+    if (artifact.isTreeArtifact()) {
+      return actionValue.getTreeArtifactValue(artifact);
+    } else if (!isAggregatingValue(action)) {
       try {
         return createSimpleValue(artifact, actionValue);
       } catch (IOException e) {