commit 9d51829f4ea746c088d1b588254d202e31bd28fd
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 14 13:06:20 2020 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 14 13:06:20 2020 +0100
tree 2635e99e7e648f52efbe8685c57763c1f0044312
parent cb80e46de9f35852214f0a8f454525dbf5c79327

Don't pass non-class types to isSubtype

Change-Id: I4ffaa77c5edb87d8283abc3b80e9538e501a6051

src/main/java/com/android/tools/r8/graph/AppInfoWithClassHierarchy.java

diff --git a/src/main/java/com/android/tools/r8/graph/AppInfoWithClassHierarchy.java b/src/main/java/com/android/tools/r8/graph/AppInfoWithClassHierarchy.java
index 87a2343..de380e8 100644
--- a/src/main/java/com/android/tools/r8/graph/AppInfoWithClassHierarchy.java
+++ b/src/main/java/com/android/tools/r8/graph/AppInfoWithClassHierarchy.java
@@ -36,12 +36,16 @@
   public boolean isSubtype(DexType subtype, DexType supertype) {
     assert subtype != null;
     assert supertype != null;
+    assert subtype.isClassType();
+    assert supertype.isClassType();
     return subtype == supertype || isStrictSubtypeOf(subtype, supertype);
   }
 
   public boolean isStrictSubtypeOf(DexType subtype, DexType supertype) {
     assert subtype != null;
     assert supertype != null;
+    assert subtype.isClassType();
+    assert supertype.isClassType();
     if (subtype == supertype) {
       return false;
     }

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

diff --git a/src/main/java/com/android/tools/r8/shaking/MainDexListBuilder.java b/src/main/java/com/android/tools/r8/shaking/MainDexListBuilder.java
index 15be9af..bfefefa 100644
--- a/src/main/java/com/android/tools/r8/shaking/MainDexListBuilder.java
+++ b/src/main/java/com/android/tools/r8/shaking/MainDexListBuilder.java
@@ -101,12 +101,14 @@
           DexProto proto = method.method.proto;
           if (proto.parameters.isEmpty()) {
             DexType valueType = proto.returnType.toBaseType(appInfo.dexItemFactory());
-            if (isEnum(valueType)) {
-              value = true;
-              break;
-            } else if (isAnnotation(valueType) && isAnnotationWithEnum(valueType)) {
-              value = true;
-              break;
+            if (valueType.isClassType()) {
+              if (isEnum(valueType)) {
+                value = true;
+                break;
+              } else if (isAnnotation(valueType) && isAnnotationWithEnum(valueType)) {
+                value = true;
+                break;
+              }
             }
           }
         }