commit cfc3432003a1a65ee9ef4046e8dc248363f9bcca
author janakr <janakr@google.com> Mon Mar 26 11:10:08 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Mon Mar 26 11:11:30 2018 -0700
tree 0f75acb2585a34540f834baab844383928ad8030
parent 3b9e1522bc20ead42f40870f9dabb72b1545c7df

Automated rollback of commit 316cd7da6f6b003b853ccf7d144f395a9a557400.

*** Reason for rollback ***

Roll-forward with fix (equality and hashcode for relevant classes). Also add a bit more debugging info in case of failure.

PiperOrigin-RevId: 190492934

src/main/java/com/google/devtools/build/lib/syntax/Environment.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
index 76b4f8b..697c317 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
@@ -602,12 +602,14 @@
         }
         badEntries.add(
             String.format(
-                "%s: this one has %s (class %s), but given one has %s (class %s)",
+                "%s: this one has %s (class %s, %s), but given one has %s (class %s, %s)",
                 name,
                 Printer.repr(value),
                 value.getClass().getName(),
+                value,
                 Printer.repr(otherValue),
-                otherValue.getClass().getName()));
+                otherValue.getClass().getName(),
+                otherValue));
       }
       if (!badEntries.isEmpty()) {
         throw new IllegalStateException(