commit 0bf37add7297f567cd8859d065579c6d6e0b0197
author Morten Krogh-Jespersen <mkroghj@google.com> Thu May 07 12:50:04 2020 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu May 07 12:51:41 2020 +0000
tree edf6b39278975e4b18ba9a18c6e55f1b8f7c8a7f
parent faba79c8ae9868ac37e3c186ecfde7ce3aba6ded

Use initialMissingTypes after final round of tracing

Bug: 155911406
Change-Id: I3c2fae11d9e884d4a70cec26662a8bcf6ed01921

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 3288a39..bb5b89a 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -2836,7 +2836,11 @@
         new AppInfoWithLiveness(
             app,
             SetUtils.mapIdentityHashSet(deadProtoTypeCandidates, DexProgramClass::getType),
-            missingTypes,
+            // TODO(b/155959821): We should be able to assert that missing types is a subset of
+            //   initialMissingTypes + synthesized types.
+            mode.isFinalTreeShaking()
+                ? Sets.union(initialMissingTypes, missingTypes)
+                : missingTypes,
             SetUtils.mapIdentityHashSet(liveTypes.getItems(), DexProgramClass::getType),
             Collections.unmodifiableSet(instantiatedAppServices),
             Enqueuer.toSortedDescriptorSet(targetedMethods.getItems()),