commit 5700cdb83f3f576cee8b0beff40d28c9a7394134
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Sep 13 20:54:06 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Sep 14 10:43:56 2021 +0000
tree 217fd7650bbb9b42e24394cf95580e2cd70ef0f3
parent d9a700a12de8147925e3fd5447ec1b69c0b1c966

Resolve NPE in proto optimization with missing proto classes

Bug: 199693523
Change-Id: Ic9889c0649ee90f95dbbbc4ea3a33a67104de3b0

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

diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index 68fc3dc..c4e0518 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -564,8 +564,10 @@
   }
 
   public void addDeadProtoTypeCandidate(DexType type) {
-    assert type.isProgramType(appView);
-    addDeadProtoTypeCandidate(appView.definitionFor(type).asProgramClass());
+    DexProgramClass clazz = asProgramClassOrNull(appView.definitionFor(type));
+    if (clazz != null) {
+      addDeadProtoTypeCandidate(clazz);
+    }
   }
 
   public void addDeadProtoTypeCandidate(DexProgramClass clazz) {