commit e8afcad579def298f67a8d4557bb8bec38397f5f
author ulfjack <ulfjack@google.com> Mon Dec 16 03:18:32 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Dec 16 03:19:29 2019 -0800
tree d2ff7c7150938a91007e8fbfb5ed9f2f025b6831
parent b88bec2e59cfe0d3634d99e7453bfd108cbdc42b

Add TransitiveTargetKey.toString to aid debugging

Also add a bit more details to ErrorInfo.

PiperOrigin-RevId: 285738697

src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetKey.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetKey.java
index 410b48b..d3253cc 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetKey.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetKey.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.skyframe;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
@@ -53,6 +54,11 @@
   }
 
   @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this).add("label", label).toString();
+  }
+
+  @Override
   public int hashCode() {
     return 31 * functionName().hashCode() + label.hashCode();
   }

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

diff --git a/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java b/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java
index 0451008..d09fc6d 100644
--- a/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java
+++ b/src/main/java/com/google/devtools/build/skyframe/ErrorInfo.java
@@ -62,7 +62,8 @@
   /** Create an ErrorInfo from a collection of existing errors. */
   public static ErrorInfo fromChildErrors(SkyKey currentValue, Collection<ErrorInfo> childErrors) {
     Preconditions.checkNotNull(currentValue, "currentValue must not be null");
-    Preconditions.checkState(!childErrors.isEmpty(), "childErrors may not be empty");
+    Preconditions.checkState(
+        !childErrors.isEmpty(), "childErrors may not be empty %s", currentValue);
 
     NestedSetBuilder<SkyKey> rootCausesBuilder = NestedSetBuilder.stableOrder();
     ImmutableList.Builder<CycleInfo> cycleBuilder = ImmutableList.builder();