commit 279eea91ebce39d4636904be0a4f48230a328b85
author Clément Béra <clementbera@google.com> Tue Jan 17 13:08:59 2023 +0100
committer Clément Béra <clementbera@google.com> Tue Jan 17 12:10:07 2023 +0000
tree 79ac00fc12c86abeac7e74cea3e22d52e8474d81
parent e6087bfe54dd9d9636ddac4d390c3412acbeb129

Fix invokes to backports

Change-Id: I008bc5643b092b29c725371f6ba611a9d35f7427

src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryContentTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryContentTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryContentTest.java
index 2c99723..fb817c5 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryContentTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryContentTest.java
@@ -29,10 +29,13 @@
 import com.android.tools.r8.graph.DexMethod;
 import com.android.tools.r8.graph.DirectMappedDexApplication;
 import com.android.tools.r8.graph.MethodResolutionResult;
+import com.android.tools.r8.ir.desugar.BackportedMethodRewriter;
 import com.android.tools.r8.synthesis.SyntheticItems.GlobalSyntheticsStrategy;
 import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.AndroidApp;
+import com.android.tools.r8.utils.InternalOptions;
 import com.android.tools.r8.utils.Pair;
+import com.android.tools.r8.utils.ThreadUtils;
 import com.android.tools.r8.utils.Timing;
 import com.android.tools.r8.utils.codeinspector.CodeInspector;
 import com.android.tools.r8.utils.codeinspector.FoundClassSubject;
@@ -123,10 +126,9 @@
         AndroidApp.builder()
             .addLibraryFiles(libraryDesugaringSpecification.getLibraryFiles())
             .build();
+    InternalOptions options = inspector.getApplication().options;
     DirectMappedDexApplication libHolder =
-        new ApplicationReader(build, inspector.getApplication().options, Timing.empty())
-            .read()
-            .toDirect();
+        new ApplicationReader(build, options, Timing.empty()).read().toDirect();
     DirectMappedDexApplication finalApp =
         inspector
             .getApplication()
@@ -139,6 +141,9 @@
                 AppInfo.createInitialAppInfo(
                     finalApp, GlobalSyntheticsStrategy.forNonSynthesizing()))
             .appInfoForDesugaring();
+    List<DexMethod> backports =
+        BackportedMethodRewriter.generateListOfBackportedMethods(
+            build, options, ThreadUtils.getExecutorService(1));
     Map<DexMethod, Object> failures = new IdentityHashMap<>();
     for (FoundClassSubject clazz : inspector.allClasses()) {
       for (FoundMethodSubject method : clazz.allMethods()) {
@@ -154,6 +159,8 @@
         failures.remove(dexMethod);
       } else if (ALLOWED_MISSING_METHOD.contains(dexMethod.toString())) {
         failures.remove(dexMethod);
+      } else if (backports.contains(dexMethod)) {
+        failures.remove(dexMethod);
       }
     }
     assertTrue(failures.isEmpty());