commit 0c5bd402a85509e965598592e0f211d1c93a10c4
author Christoffer Adamsen <christofferqa@google.com> Mon Feb 17 08:30:14 2025 +0100
committer Christoffer Adamsen <christofferqa@google.com> Mon Feb 17 08:30:14 2025 +0100
tree 130bf5f88f422fcce491a673c8d64de641b88e88
parent e91214e514c6a379092004919ed16826bae97a75

Remove unsupported option alwaysBackportListSetMapMethods

Bug: b/391572031
Change-Id: I3d350fa6d387501302dadcbdede944ef96b23cf6

src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
index 04fb94e..7595d4e 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
@@ -334,10 +334,7 @@
         initializeAndroidQMethodProviders(factory);
       }
       if (options.getMinApiLevel().isLessThan(AndroidApiLevel.R)) {
-        if (options.testing.alwaysBackportListSetMapMethods
-            || typeIsPresentWithoutBackportsFrom(factory.javaUtilSetType, AndroidApiLevel.R)) {
-          initializeAndroidRSetListMapMethodProviders(factory);
-        }
+        initializeAndroidRSetListMapMethodProviders(factory);
         if (typeIsAbsentOrPresentWithoutBackportsFrom(factory.objectsType, AndroidApiLevel.R)) {
           initializeAndroidRObjectsMethodProviders(factory);
           if (typeIsPresent(factory.supplierType)) {
@@ -347,10 +344,7 @@
       }
       if (options.getMinApiLevel().isLessThan(AndroidApiLevel.S)) {
         initializeAndroidSMethodProviders(factory);
-        if (options.testing.alwaysBackportListSetMapMethods
-            || typeIsPresentWithoutBackportsFrom(factory.javaUtilSetType, AndroidApiLevel.S)) {
-          initializeAndroidSSetListMapMethodProviders(factory);
-        }
+        initializeAndroidSSetListMapMethodProviders(factory);
       }
       if (options.getMinApiLevel().isLessThan(AndroidApiLevel.Sv2)) {
         initializeAndroidSv2MethodProviders(factory);

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index f26afb8..8bf530b 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -2174,8 +2174,6 @@
       return currentPhase == LirPhase.POST;
     }
 
-    // If false, use the desugared library implementation when desugared library is enabled.
-    public boolean alwaysBackportListSetMapMethods = true;
     public boolean neverReuseCfLocalRegisters = false;
     public boolean checkReceiverAlwaysNullInCallSiteOptimization = true;
     public boolean forceInlineAPIConversions = false;

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

diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/CollectionOfTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/CollectionOfTest.java
index e58ce54..5792e22 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/CollectionOfTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/CollectionOfTest.java
@@ -14,7 +14,6 @@
 import com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification;
 import com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification;
 import com.android.tools.r8.utils.AndroidApiLevel;
-import com.android.tools.r8.utils.BooleanUtils;
 import com.android.tools.r8.utils.StringUtils;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -55,34 +54,21 @@
     this.compilationSpecification = compilationSpecification;
   }
 
-  private String getExpectedOutput(boolean desugaredLib, boolean alwaysBackportListSetMapMethods) {
+  private String getExpectedOutput() {
     if (parameters.getApiLevel().isGreaterThanOrEqualTo(AndroidApiLevel.R)) {
       return EXPECTED_OUTPUT_CORRECT;
     }
-    if (alwaysBackportListSetMapMethods) {
-      return EXPECTED_OUTPUT_BACKPORT;
-    }
-    if (desugaredLib && libraryDesugaringSpecification != JDK8) {
-      if (parameters.getApiLevel().isLessThan(AndroidApiLevel.N)) {
-        return EXPECTED_OUTPUT_CORRECT;
-      }
-      // TODO(b/243679691): This should also be correct, but is not because we use backports in
-      //  partial desugaring.
-      return EXPECTED_OUTPUT_BACKPORT;
-    }
     return EXPECTED_OUTPUT_BACKPORT;
   }
 
   @Test
   public void testCollectionOf() throws Throwable {
-    for (Boolean value : BooleanUtils.values()) {
-      testForDesugaredLibrary(parameters, libraryDesugaringSpecification, compilationSpecification)
-          .addProgramFiles(INPUT_JAR)
-          .addKeepMainRule(MAIN_CLASS)
-          .addOptionsModification(opt -> opt.testing.alwaysBackportListSetMapMethods = value)
-          .run(parameters.getRuntime(), MAIN_CLASS)
-          .assertSuccessWithOutput(getExpectedOutput(true, value));
-    }
+    testForDesugaredLibrary(parameters, libraryDesugaringSpecification, compilationSpecification)
+        .addProgramFiles(INPUT_JAR)
+        .addKeepMainRule(MAIN_CLASS)
+        .compile()
+        .run(parameters.getRuntime(), MAIN_CLASS)
+        .assertSuccessWithOutput(getExpectedOutput());
   }
 
   @Test
@@ -94,6 +80,6 @@
         .addProgramFiles(INPUT_JAR)
         .setMinApi(parameters)
         .run(parameters.getRuntime(), MAIN_CLASS)
-        .assertSuccessWithOutput(getExpectedOutput(false, true));
+        .assertSuccessWithOutput(getExpectedOutput());
   }
 }