Return raw SkyValue instead of wrapped ValueWithMetadata.
--
MOS_MIGRATED_REVID=101377320
diff --git a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
index ac27ee0..949e25e 100644
--- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
@@ -1127,7 +1127,11 @@
// always the case in a keepGoing evaluation, since it is assumed that done nodes do not
// need to be traversed. In this case, we hope the caller is tolerant of a possibly empty
// result, and return prematurely.
- bubbleErrorInfo = ImmutableMap.of(errorKey, graph.get(errorKey).getValueWithMetadata());
+ bubbleErrorInfo =
+ ImmutableMap.of(
+ errorKey,
+ ValueWithMetadata.wrapWithMetadata(
+ graph.get(errorKey).getValueMaybeWithMetadata()));
}
}
@@ -1649,7 +1653,9 @@
"Value cannot have error before evaluation started", key, value);
return ValueWithMetadata.wrapWithMetadata(value);
}
- return isDoneForBuild(entry) ? entry.getValueWithMetadata() : null;
+ return isDoneForBuild(entry)
+ ? ValueWithMetadata.wrapWithMetadata(entry.getValueMaybeWithMetadata())
+ : null;
}
@Nullable