Put NodeEntry in Supplier<SkyValue> passed to EvaluationProgressReceiver so it's readily accessible in the program.

--
MOS_MIGRATED_REVID=107698784

1 files changed, 3 insertions, 1 deletions

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 c993f0caf9..af774c6607 100644
--- a/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/ParallelEvaluator.java
@@ -599,7 +599,9 @@ public final class ParallelEvaluator implements Evaluator {
         // by the Preconditions check above, and was not actually changed this run -- when it was
         // written above, its version stayed below this update's version, so its value remains the
         // same as before.
-        progressReceiver.evaluated(skyKey, Suppliers.ofInstance(value),
+        // We use a SkyValueSupplier here because it keeps a reference to the entry, allowing for
+        // the receiver to be confident that the entry is readily accessible in memory.
+        progressReceiver.evaluated(skyKey, new SkyValueSupplier(primaryEntry),
             valueVersion.equals(graphVersion) ? EvaluationState.BUILT : EvaluationState.CLEAN);
       }
       signalValuesAndEnqueueIfReady(enqueueParents ? visitor : null, reverseDeps, valueVersion);