Fix crash on deserializing INTEGER_LIST attributes in packages.

Currently, this can only happen if a Skylark rules declare use of such an INTEGER_LIST.

--
MOS_MIGRATED_REVID=102054727

1 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java b/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java
index 95a928fb57..ad335aaa25 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageDeserializer.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.packages;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import com.google.common.cache.CacheBuilder;
@@ -532,7 +533,8 @@ public class PackageDeserializer {
   }
 
   // TODO(bazel-team): Verify that these put sane values in the attribute
-  private static Object deserializeAttributeValue(Type<?> expectedType,
+  @VisibleForTesting
+  static Object deserializeAttributeValue(Type<?> expectedType,
       Build.Attribute attrPb)
       throws PackageDeserializationException {
     switch (attrPb.getType()) {
@@ -638,6 +640,9 @@ public class PackageDeserializer {
       case TRISTATE:
         return attrPb.hasStringValue() ? deserializeTriStateValue(attrPb.getStringValue()) : null;
 
+      case INTEGER_LIST:
+        return ImmutableList.copyOf(attrPb.getIntListValueList());
+
       default:
           throw new PackageDeserializationException("Invalid discriminator: " + attrPb.getType());
     }