commit 867ede341fbd30e07b0fda6eba72daff006e90b5
author Christoffer Quist Adamsen <christofferqa@google.com> Tue May 04 09:48:26 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue May 04 11:52:22 2021 +0000
tree 4a507bd1c47e354af3b242755a7bc0e92741145a
parent 9b3d08eeb90369e8ecea5096e7cc5727ea79c69b

Fix lens rewriting of synthetic inputs

Change-Id: I35217adaff35472ed6f4ca9cc8d927377ad101cf

src/main/java/com/android/tools/r8/synthesis/CommittedItems.java

diff --git a/src/main/java/com/android/tools/r8/synthesis/CommittedItems.java b/src/main/java/com/android/tools/r8/synthesis/CommittedItems.java
index adc1298..f71c94e 100644
--- a/src/main/java/com/android/tools/r8/synthesis/CommittedItems.java
+++ b/src/main/java/com/android/tools/r8/synthesis/CommittedItems.java
@@ -38,7 +38,7 @@
     this.application = application;
     this.committed = committed;
     this.committedProgramTypes = committedProgramTypes;
-    committed.verifyTypesAreInApp(application);
+    assert committed.verifyTypesAreInApp(application);
   }
 
   // Conversion to a mutable synthetic items collection. Should only be used in AppInfo creation.

src/main/java/com/android/tools/r8/synthesis/CommittedSyntheticsCollection.java

diff --git a/src/main/java/com/android/tools/r8/synthesis/CommittedSyntheticsCollection.java b/src/main/java/com/android/tools/r8/synthesis/CommittedSyntheticsCollection.java
index f8c56fa..cd80b53 100644
--- a/src/main/java/com/android/tools/r8/synthesis/CommittedSyntheticsCollection.java
+++ b/src/main/java/com/android/tools/r8/synthesis/CommittedSyntheticsCollection.java
@@ -298,23 +298,18 @@
   }
 
   CommittedSyntheticsCollection rewriteWithLens(NonIdentityGraphLens lens) {
+    ImmutableSet.Builder<DexType> syntheticInputsBuilder = ImmutableSet.builder();
     return new CommittedSyntheticsCollection(
-        rewriteItems(legacyTypes, lens),
-        rewriteItems(nonLegacyMethods, lens),
-        rewriteItems(nonLegacyClasses, lens),
-        rewriteItems(syntheticInputs, lens));
-  }
-
-  private static ImmutableSet<DexType> rewriteItems(Set<DexType> items, NonIdentityGraphLens lens) {
-    ImmutableSet.Builder<DexType> rewrittenItems = ImmutableSet.builder();
-    for (DexType item : items) {
-      rewrittenItems.add(lens.lookupType(item));
-    }
-    return rewrittenItems.build();
+        rewriteItems(legacyTypes, lens, syntheticInputsBuilder),
+        rewriteItems(nonLegacyMethods, lens, syntheticInputsBuilder),
+        rewriteItems(nonLegacyClasses, lens, syntheticInputsBuilder),
+        syntheticInputsBuilder.build());
   }
 
   private <R extends Rewritable<R>> ImmutableMap<DexType, List<R>> rewriteItems(
-      Map<DexType, List<R>> items, NonIdentityGraphLens lens) {
+      Map<DexType, List<R>> items,
+      NonIdentityGraphLens lens,
+      ImmutableSet.Builder<DexType> syntheticInputsBuilder) {
     Map<DexType, List<R>> rewrittenItems = new IdentityHashMap<>();
     for (R reference : IterableUtils.flatten(items.values())) {
       R rewritten = reference.rewrite(lens);
@@ -322,6 +317,9 @@
         rewrittenItems
             .computeIfAbsent(rewritten.getHolder(), ignore -> new ArrayList<>())
             .add(rewritten);
+        if (syntheticInputs.contains(reference.getHolder())) {
+          syntheticInputsBuilder.add(rewritten.getHolder());
+        }
       }
     }
     return ImmutableMap.copyOf(rewrittenItems);