Increase visibility of an InMemoryNodeEntry method

For use in alternate graph implementations.

Also adds some user-friendly methods to StringValue, a SkyValue
implementation used in tests.

--
MOS_MIGRATED_REVID=104899226

1 files changed, 3 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
index 094d40a2e3..825584e596 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
@@ -130,8 +130,7 @@ public class InMemoryNodeEntry implements NodeEntry {
    * The transient state of this entry, after it has been created but before it is done. It allows
    * us to keep the current state of the entry across invalidation and successive evaluations.
    */
-  @VisibleForTesting
-  protected BuildingState buildingState = new BuildingState();
+  @VisibleForTesting @Nullable protected BuildingState buildingState = new BuildingState();
 
   /**
    * Construct a InMemoryNodeEntry. Use ONLY in Skyframe evaluation and graph implementations.
@@ -184,7 +183,7 @@ public class InMemoryNodeEntry implements NodeEntry {
 
   /**
    * If {@code isDone()}, returns the ordered list of sets of grouped direct dependencies that were
-   * added in {@link addTemporaryDirectDeps}.
+   * added in {@link #addTemporaryDirectDeps}.
    */
   public synchronized Iterable<Iterable<SkyKey>> getGroupedDirectDeps() {
     assertKeepEdges();
@@ -199,7 +198,7 @@ public class InMemoryNodeEntry implements NodeEntry {
     return ValueWithMetadata.getMaybeErrorInfo(value);
   }
 
-  private synchronized Set<SkyKey> setStateFinishedAndReturnReverseDeps() {
+  protected synchronized Set<SkyKey> setStateFinishedAndReturnReverseDeps() {
     // Get reverse deps that need to be signaled.
     ImmutableSet<SkyKey> reverseDepsToSignal = buildingState.getReverseDepsToSignal();
     REVERSE_DEPS_UTIL.consolidateData(this);