Allow "attr = glob([*]) + select({...})" intermixing in

an attribute assignment.

--
MOS_MIGRATED_REVID=93460093

1 files changed, 6 insertions, 0 deletions

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 f923e830ac..b20f59625d 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
@@ -17,6 +17,7 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.events.Location;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -92,6 +93,11 @@ public final class SelectorList {
     } else if (value instanceof SelectorValue) {
       builder.add(value);
       return ((SelectorValue) value).getType();
+    } else if (value instanceof GlobList) {
+      builder.add(((GlobList<?>) value).delegate());
+      // TODO(bazel-team): match on the List interface, not the actual implementation. For now,
+      // we verify this is the right class through test coverage.
+      return ArrayList.class;
     } else {
       builder.add(value);
       return value.getClass();