commit 7e1c201c399d1ca933579830b0857bc7a7fc7835
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Apr 12 09:22:58 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Apr 12 08:43:48 2021 +0000
tree 6e912cfbd6f001dc8dc1ec3cf2199be953a2c396
parent 542a41b4ccac4370db4887fed251c4617ac4f217

Handle synthesizing class contexts in missing classes

Bug: 183734568
Change-Id: I659a4aed6edb24dea31cf5b0cbdc5aef8d6939b1

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

diff --git a/src/main/java/com/android/tools/r8/shaking/MissingClasses.java b/src/main/java/com/android/tools/r8/shaking/MissingClasses.java
index 317a4cd..0330dca 100644
--- a/src/main/java/com/android/tools/r8/shaking/MissingClasses.java
+++ b/src/main/java/com/android/tools/r8/shaking/MissingClasses.java
@@ -204,6 +204,10 @@
                 holder.lookupProgramMethod(synthesizingContextReference.asDexMethod());
             assert synthesizingContext != null;
             rewrittenContexts.add(synthesizingContext);
+          } else if (synthesizingContextReference.isDexType()) {
+            DexProgramClass synthesizingClass =
+                appView.definitionFor(synthesizingContextReference.asDexType()).asProgramClass();
+            rewrittenContexts.add(synthesizingClass);
           } else {
             assert false
                 : "Unexpected synthesizing context: "