Fix NullPointerException on "select({}) + <something else>" clauses.

It's fine for these to fail, since "select({})" is by definition
unresolvable (and type non-inferrable). But the error should be clear.

--
MOS_MIGRATED_REVID=135138890

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SelectorValue.java b/src/main/java/com/google/devtools/build/lib/syntax/SelectorValue.java
index f8a81024ca..7ff2e8bc2a 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SelectorValue.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SelectorValue.java
@@ -48,7 +48,8 @@ public final class SelectorValue implements SkylarkValue {
   public SelectorValue(Map<?, ?> dictionary, String noMatchError) {
     // Put the dict through a sorting to avoid depending on insertion order.
     this.dictionary = ImmutableMap.copyOf(new TreeMap<>(dictionary));
-    this.type = dictionary.isEmpty() ? null : Iterables.get(dictionary.values(), 0).getClass();
+    this.type =
+        dictionary.isEmpty() ? Object.class : Iterables.get(dictionary.values(), 0).getClass();
     this.noMatchError = noMatchError;
   }