commit 788fd1add818820b876e0e3b2e8fe112f2358bd4
author Ulf Adams <ulfjack@google.com> Thu Mar 12 13:54:09 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Fri Mar 13 14:17:57 2015 +0000
tree a45ca3e956a676104dc60ff7315a57e7a0f88e46
parent f242a97639bef79a85992fb03463fd211c9bb1ab

Simplify Attribute builder now that all rules specify allowed file types.

--
MOS_MIGRATED_REVID=88436595

src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index 0de3117..dc6f2da 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -1397,6 +1397,10 @@
         return;
       }
       FileTypeSet allowedFileTypes = attribute.getAllowedFileTypesPredicate();
+      if (allowedFileTypes == null) {
+        // It's not a label or label_list attribute.
+        return;
+      }
       if (allowedFileTypes == FileTypeSet.ANY_FILE && !attribute.isNonEmpty()
           && !attribute.isSingleArtifact()) {
         return;