commit 94d4a4d223ce259376361718662cdee45d9fea84
author Søren Gjesse <sgjesse@google.com> Tue Oct 19 16:55:52 2021 +0200
committer Søren Gjesse <sgjesse@google.com> Tue Oct 19 16:55:52 2021 +0200
tree 085dfb441a3a4240ff5d86c73e6cafca8cea7831
parent 089989ec29b6fed9d55a7849d569b35e8d335d17

Fix NPE in maindex tracing

Handle classes without definition.

Bug: 202173862
Change-Id: Id04483cbff63beda703d91be7f483effe32bfb7d

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 b648635..ffa265c 100644
--- a/src/main/java/com/android/tools/r8/shaking/MainDexListBuilder.java
+++ b/src/main/java/com/android/tools/r8/shaking/MainDexListBuilder.java
@@ -129,8 +129,9 @@
             DexType valueType = proto.returnType.toBaseType(appView.dexItemFactory());
             if (valueType.isClassType()) {
               assert !value;
+              DexClass valueTypeClass = appInfo().definitionFor(valueType);
               boolean notLibraryOrTakeBootClasspath =
-                  !appInfo().definitionFor(valueType).isLibraryClass()
+                  (valueTypeClass != null && !valueTypeClass.isLibraryClass())
                       || !appView.options().ignoreBootClasspathEnumsForMaindexTracing;
               value =
                   (isEnum(valueType) && notLibraryOrTakeBootClasspath)