Even more select concatenation: this time when a glob is *in* the select. -- MOS_MIGRATED_REVID=94596318
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java b/src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java index 21b4a35..f77f8d7 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/SelectorList.java
@@ -97,9 +97,6 @@ } else if (value instanceof SelectorValue) { builder.add(value); return ((SelectorValue) value).getType(); - } else if (value instanceof GlobList) { - builder.add(((GlobList<?>) value).delegate()); - return NATIVE_LIST_TYPE; } else { builder.add(value); return value.getClass(); @@ -107,7 +104,9 @@ } private static boolean isListType(Class<?> type) { - return type == NATIVE_LIST_TYPE || type.getSuperclass() == SkylarkList.class; + return type == NATIVE_LIST_TYPE + || type.getSuperclass() == SkylarkList.class + || type == GlobList.class; } private static boolean canConcatenate(Class<?> type1, Class<?> type2) {