commit 0ecbcbbe4654bb082213d3cd25a6b1fe1c9c31de
author Morten Krogh-Jespersen <mkroghj@google.com> Tue Feb 23 13:50:57 2021 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue Feb 23 12:52:13 2021 +0000
tree 17aa91350cd49c2e968dfc863212398708734035
parent bc4f54ff2c45b64ce9e8c7306a2951c42499507b

Lookup the rewritten type when rewriting kotlin metadata

Bug: 180707970
Change-Id: Icaaabc4b1afa9eb8a1782e9b198cd0c6294eb32d

src/main/java/com/android/tools/r8/kotlin/KotlinTypeReference.java

diff --git a/src/main/java/com/android/tools/r8/kotlin/KotlinTypeReference.java b/src/main/java/com/android/tools/r8/kotlin/KotlinTypeReference.java
index 088e7ec..bcbf589 100644
--- a/src/main/java/com/android/tools/r8/kotlin/KotlinTypeReference.java
+++ b/src/main/java/com/android/tools/r8/kotlin/KotlinTypeReference.java
@@ -65,11 +65,12 @@
     if (!known.isClassType()) {
       return known.descriptor.toString();
     }
+    DexType rewrittenType = appView.graphLens().lookupClassType(known);
     if (appView.appInfo().hasLiveness()
-        && !appView.withLiveness().appInfo().isNonProgramTypeOrLiveProgramType(known)) {
+        && !appView.withLiveness().appInfo().isNonProgramTypeOrLiveProgramType(rewrittenType)) {
       return defaultValue;
     }
-    DexString descriptor = namingLens.lookupDescriptor(known);
+    DexString descriptor = namingLens.lookupDescriptor(rewrittenType);
     if (descriptor != null) {
       return descriptor.toString();
     }
@@ -102,7 +103,7 @@
   public void trace(DexDefinitionSupplier definitionSupplier) {
     if (known != null && known.isClassType()) {
       // Lookup the definition, ignoring the result. This populates the sets in the Enqueuer.
-      definitionSupplier.definitionFor(known);
+      definitionSupplier.contextIndependentDefinitionFor(known);
     }
   }
 }