commit 44eb96413bc99291854c51a04b18397a400ccd90
author felly <felly@google.com> Tue Mar 27 12:41:13 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue Mar 27 12:44:34 2018 -0700
tree eb28525ba60372fe976a616a00a1de21e03796e5
parent c9dcf83ccdeced9a68ab1d5719e51c51e9881fd2

Fix accidental eager expansion of grouped list in in-memory nodes.

PiperOrigin-RevId: 190656902

src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java

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 24dfeab..7b48275 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
@@ -491,7 +491,7 @@
 
   @Override
   public synchronized void forceRebuild() {
-    Preconditions.checkState(getTemporaryDirectDeps().numElements() == signaledDeps, this);
+    Preconditions.checkState(getNumTemporaryDirectDeps() == signaledDeps, this);
     getDirtyBuildingState().forceChanged();
   }
 
@@ -560,6 +560,10 @@
     return (GroupedList<SkyKey>) directDeps;
   }
 
+  private synchronized int getNumTemporaryDirectDeps() {
+    return directDeps == null ? 0 : getTemporaryDirectDeps().numElements();
+  }
+
   @Override
   public synchronized boolean noDepsLastBuild() {
     return getDirtyBuildingState().noDepsLastBuild();
@@ -592,7 +596,7 @@
   @Override
   public synchronized boolean isReady() {
     Preconditions.checkState(!isDone(), "can't be ready if done: %s", this);
-    return isReady(getTemporaryDirectDeps().numElements());
+    return isReady(getNumTemporaryDirectDeps());
   }
 
   /** Returns whether all known children of this node have signaled that they are done. */