commit 0158f84d3cccfd6c9b2bac15f54e5938e0c96aa1
author Søren Gjesse <sgjesse@google.com> Tue Oct 19 17:31:47 2021 +0200
committer Søren Gjesse <sgjesse@google.com> Tue Oct 19 17:31:47 2021 +0200
tree 4f525579a5e3c8f3e3648d5e95b748b41b53b043
parent d6dcec11e384590450ccc688a7a6e81ec256ef49
parent 94d4a4d223ce259376361718662cdee45d9fea84

Merge commit '94d4a4d223ce259376361718662cdee45d9fea84' into dev-release

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)