commit c12b59610abef1ac4b2388e4fd81053cb592bf91
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Oct 03 10:21:41 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 03 10:21:41 2018 +0000
tree 724732c9a54db09a77f819fc7db39bafe323f4ba
parent a81871c0f23a415bf5b65edf9a6f80da01b0024a
parent 99b626fedbe6e2d29831c11de0ac9383e2e37b97

Merge "Anticipate nulls in InnerClassAttributes"

src/main/java/com/android/tools/r8/shaking/TreePruner.java

diff --git a/src/main/java/com/android/tools/r8/shaking/TreePruner.java b/src/main/java/com/android/tools/r8/shaking/TreePruner.java
index 0400670..1d57ddf 100644
--- a/src/main/java/com/android/tools/r8/shaking/TreePruner.java
+++ b/src/main/java/com/android/tools/r8/shaking/TreePruner.java
@@ -107,8 +107,8 @@
   }
 
   private boolean isAttributeReferencingPrunedType(InnerClassAttribute attr) {
-    return !appInfo.liveTypes.contains(attr.getInner())
-        || !appInfo.liveTypes.contains(attr.getOuter());
+    return (attr.getInner() != null && !appInfo.liveTypes.contains(attr.getInner()))
+        || (attr.getOuter() != null && !appInfo.liveTypes.contains(attr.getOuter()));
   }
 
   private <S extends PresortedComparable<S>, T extends KeyedDexItem<S>> int firstUnreachableIndex(