commit 1932e57c7bf58f96aed8c3e06fad612c6e6f817d
author Morten Krogh-Jespersen <mkroghj@google.com> Tue Feb 23 16:28:35 2021 +0000
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue Feb 23 16:28:59 2021 +0000
tree 7ba55755383edbf90e3d986bb1e0254104887c4d
parent cd1fcbd804d53e44ddb4a4ff12f7fdf097fe10cc

Revert "Lookup the rewritten type when rewriting kotlin metadata"

This reverts commit 0ecbcbbe4654bb082213d3cd25a6b1fe1c9c31de.

Reason for revert: Fails pruning merged super-types.

Change-Id: I96eeb415accd25d801825363a054bd466eb8183b

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 bcbf589..088e7ec 100644
--- a/src/main/java/com/android/tools/r8/kotlin/KotlinTypeReference.java
+++ b/src/main/java/com/android/tools/r8/kotlin/KotlinTypeReference.java
@@ -65,12 +65,11 @@
     if (!known.isClassType()) {
       return known.descriptor.toString();
     }
-    DexType rewrittenType = appView.graphLens().lookupClassType(known);
     if (appView.appInfo().hasLiveness()
-        && !appView.withLiveness().appInfo().isNonProgramTypeOrLiveProgramType(rewrittenType)) {
+        && !appView.withLiveness().appInfo().isNonProgramTypeOrLiveProgramType(known)) {
       return defaultValue;
     }
-    DexString descriptor = namingLens.lookupDescriptor(rewrittenType);
+    DexString descriptor = namingLens.lookupDescriptor(known);
     if (descriptor != null) {
       return descriptor.toString();
     }
@@ -103,7 +102,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.contextIndependentDefinitionFor(known);
+      definitionSupplier.definitionFor(known);
     }
   }
 }