commit 44666dc253bac9064216c6693a0184edfef9ed6d
author shahan <shahan@google.com> Fri Oct 05 17:47:11 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Oct 05 17:49:57 2018 -0700
tree df0d49c9c1953e24085443c4f7605120f1a6f918
parent e2649cf4ee2d08ec803478650c20f8caa87ec440

Adds childForDebugging parameter to NodeEntry.signalDep method.

PiperOrigin-RevId: 215994280

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 fcc1d3b..b5627a5 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
@@ -453,17 +453,19 @@
 
   @Override
   public synchronized boolean signalDep() {
-    return signalDep(/*childVersion=*/ IntVersion.of(Long.MAX_VALUE));
+    return signalDep(/*childVersion=*/ IntVersion.of(Long.MAX_VALUE), /*childForDebugging=*/ null);
   }
 
   @Override
-  public synchronized boolean signalDep(Version childVersion) {
-    Preconditions.checkState(!isDone(), "Value must not be done in signalDep %s", this);
-    Preconditions.checkState(isEvaluating(), this);
+  public synchronized boolean signalDep(Version childVersion, @Nullable SkyKey childForDebugging) {
+    Preconditions.checkState(
+        !isDone(), "Value must not be done in signalDep %s child=%s", this, childForDebugging);
+    Preconditions.checkState(isEvaluating(), "%s %s", this, childForDebugging);
     signaledDeps++;
     if (isDirty()) {
       dirtyBuildingState.signalDepInternal(
-          childCausesReevaluation(lastEvaluatedVersion, childVersion), isReady());
+          childCausesReevaluation(lastEvaluatedVersion, childVersion, childForDebugging),
+          isReady());
     }
     return isReady();
   }
@@ -655,7 +657,10 @@
   }
 
   /** True if the child should cause re-evaluation of this node. */
-  protected boolean childCausesReevaluation(Version lastEvaluatedVersion, Version childVersion) {
+  protected boolean childCausesReevaluation(
+      Version lastEvaluatedVersion,
+      Version childVersion,
+      @Nullable SkyKey unusedChildForDebugging) {
     // childVersion > lastEvaluatedVersion
     return !childVersion.atMost(lastEvaluatedVersion);
   }