Lift differences between Skylark and BUILD evaluation, wrt to concatenation.

In particular, struct, dict and set addition work like in Skylark files.

--
MOS_MIGRATED_REVID=88929558

1 files changed, 3 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java
index 2f1846ff6f..39f220e21c 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java
@@ -136,7 +136,7 @@ public final class BinaryOperatorExpression extends Expression {
           return SkylarkList.concat((SkylarkList) lval, (SkylarkList) rval, getLocation());
         }
 
-        if (env.isSkylarkEnabled() && lval instanceof Map<?, ?> && rval instanceof Map<?, ?>) {
+        if (lval instanceof Map<?, ?> && rval instanceof Map<?, ?>) {
           Map<?, ?> ldict = (Map<?, ?>) lval;
           Map<?, ?> rdict = (Map<?, ?>) rval;
           Map<Object, Object> result = Maps.newHashMapWithExpectedSize(ldict.size() + rdict.size());
@@ -145,13 +145,12 @@ public final class BinaryOperatorExpression extends Expression {
           return ImmutableMap.copyOf(result);
         }
 
-        if (env.isSkylarkEnabled()
-            && lval instanceof SkylarkClassObject && rval instanceof SkylarkClassObject) {
+        if (lval instanceof SkylarkClassObject && rval instanceof SkylarkClassObject) {
           return SkylarkClassObject.concat(
               (SkylarkClassObject) lval, (SkylarkClassObject) rval, getLocation());
         }
 
-        if (env.isSkylarkEnabled() && lval instanceof SkylarkNestedSet) {
+        if (lval instanceof SkylarkNestedSet) {
           return new SkylarkNestedSet((SkylarkNestedSet) lval, rval, getLocation());
         }
         break;