commit 889f562d95e65d0ccb61de85b0e906fae561dc26
author janakr <janakr@google.com> Fri Mar 16 17:49:11 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Mar 16 17:50:27 2018 -0700
tree 0dd8c5df88ad137f66609287c163d9fda5e5a2e8
parent aa5bc11c3a64d7319f9f55dd45376db05fc9db0d

@AutoCodec some expressions that show up in Java configured targets.

PiperOrigin-RevId: 189419493

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 86d9c36..c882743 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
@@ -557,15 +557,24 @@
       for (String name : names) {
         Object value = bindings.get(name);
         Object otherValue = otherBindings.get(name);
-        if (!value.equals(otherValue)) {
-          badEntries.add(String.format(
-              "%s: this one has %s (class %s), but given one has %s (class %s)",
-              name,
-              Printer.repr(value),
-              value.getClass().getName(),
-              Printer.repr(otherValue),
-              otherValue.getClass().getName()));
+        if (value.equals(otherValue)) {
+          continue;
         }
+        if (value instanceof SkylarkNestedSet
+            && otherValue instanceof SkylarkNestedSet
+            && (((SkylarkNestedSet) value)
+                .toCollection()
+                .equals(((SkylarkNestedSet) otherValue).toCollection()))) {
+          continue;
+        }
+        badEntries.add(
+            String.format(
+                "%s: this one has %s (class %s), but given one has %s (class %s)",
+                name,
+                Printer.repr(value),
+                value.getClass().getName(),
+                Printer.repr(otherValue),
+                otherValue.getClass().getName()));
       }
       if (!badEntries.isEmpty()) {
         throw new IllegalStateException(