Reapply "Desugar CharSequence#isEmpty"
This reverts commit f26ccab43e5ab2ae24bb4dae5ff39b131e8dab3f.
Bug: b/474167998
Change-Id: Ia6a52ea86558985ae31b58d1962dcb345ecff39b
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs.json b/src/library_desugar/jdk11/desugar_jdk_libs.json
index a6cb828..c592576 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs.json
@@ -11,6 +11,7 @@
"public static java.time.LocalDate java.time.LocalDate#EPOCH"
],
"amend_library_method": [
+ "public boolean java.lang.CharSequence#isEmpty()",
"public int java.time.Duration#toHoursPart()",
"public int java.time.Duration#toMillisPart()",
"public int java.time.Duration#toMinutesPart()",
@@ -111,6 +112,17 @@
]
},
{
+ "api_level_below_or_equal": 34,
+ "emulate_interface": {
+ "java.lang.CharSequence": {
+ "rewrittenType": "j$.lang.CharSequence",
+ "emulatedMethods": [
+ "public boolean java.lang.CharSequence#isEmpty()"
+ ]
+ }
+ }
+ },
+ {
"api_level_below_or_equal": 33,
"api_level_greater_or_equal": 24,
"emulate_interface": {
diff --git a/src/library_desugar/jdk11/desugar_jdk_libs_nio.json b/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
index fb98eb8..cec2533 100644
--- a/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
+++ b/src/library_desugar/jdk11/desugar_jdk_libs_nio.json
@@ -11,6 +11,7 @@
"public static java.time.LocalDate java.time.LocalDate#EPOCH"
],
"amend_library_method": [
+ "public boolean java.lang.CharSequence#isEmpty()",
"public int java.time.Duration#toHoursPart()",
"public int java.time.Duration#toMillisPart()",
"public int java.time.Duration#toMinutesPart()",
@@ -131,6 +132,17 @@
]
},
{
+ "api_level_below_or_equal": 34,
+ "emulate_interface": {
+ "java.lang.CharSequence": {
+ "rewrittenType": "j$.lang.CharSequence",
+ "emulatedMethods": [
+ "public boolean java.lang.CharSequence#isEmpty()"
+ ]
+ }
+ }
+ },
+ {
"api_level_below_or_equal": 33,
"api_level_greater_or_equal": 24,
"emulate_interface": {
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/SupportedClassesGenerator.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/SupportedClassesGenerator.java
index 1f79756..9b96cf1 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/SupportedClassesGenerator.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/lint/SupportedClassesGenerator.java
@@ -36,6 +36,7 @@
import com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses.ClassAnnotation;
import com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses.FieldAnnotation;
import com.android.tools.r8.ir.desugar.desugaredlibrary.lint.SupportedClasses.MethodAnnotation;
+import com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor;
import com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification;
import com.android.tools.r8.synthesis.SyntheticItems.GlobalSyntheticsStrategy;
import com.android.tools.r8.utils.AndroidApiLevel;
@@ -321,6 +322,8 @@
// All emulated interfaces static and default methods are supported.
if (machineSpecification.getEmulatedInterfaces().containsKey(clazz.type)) {
assert clazz.isInterface();
+ EmulatedInterfaceDescriptor descriptor =
+ machineSpecification.getEmulatedInterfaces().get(clazz.type);
for (DexEncodedMethod method : clazz.methods()) {
if (!method.isDefaultMethod() && !method.isStatic()) {
continue;
@@ -330,15 +333,10 @@
// We don't care if lambda methods are present or not.
continue;
}
- if (method
- .getReference()
- .toSourceString()
- .equals("void java.util.Collection.forEach(java.util.function.Consumer)")) {
- // This method is present for binary compatibility. Do not mark as supported (Supported
- // through Iterable#forEach).
- continue;
+ if (method.isStatic()
+ || descriptor.getEmulatedMethods().containsKey(method.getReference())) {
+ builder.addSupportedMethod(clazz, method);
}
- builder.addSupportedMethod(clazz, method);
}
addBackports(clazz, backports);
builder.annotateClass(clazz.type, ClassAnnotation.getAdditionnalMembersOnClass());
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryInvokeAllResolveTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryInvokeAllResolveTest.java
index a386d5a..ce13162 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryInvokeAllResolveTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/DesugaredLibraryInvokeAllResolveTest.java
@@ -50,9 +50,19 @@
public class DesugaredLibraryInvokeAllResolveTest extends DesugaredLibraryTestBase {
// The class sun.misc.Unsafe is runnable on Android despite not being in android.jar.
- private static final Set<String> ALLOWED_MISSING_HOLDER = ImmutableSet.of("sun.misc.Unsafe");
+ private static final Set<String> ALLOWED_MISSING_HOLDER =
+ ImmutableSet.of(
+ "sun.misc.Unsafe",
+ // The holder is used in unused methods.
+ "java.lang.CharSequence$1CharIterator",
+ "java.lang.CharSequence$1CodePointIterator");
private static final Set<String> ALLOWED_MISSING_METHOD =
ImmutableSet.of(
+ // Unused methods.
+ "java.util.Spliterator$OfInt"
+ + " java.lang.CharSequence.lambda$codePoints$1(java.lang.CharSequence)",
+ "java.util.Spliterator$OfInt"
+ + " java.lang.CharSequence.lambda$chars$0(java.lang.CharSequence)",
// The takeWhile, dropWhile and toList methods are present in the wrappers and from 34.
"java.util.stream.IntStream"
+ " java.util.stream.IntStream.dropWhile(java.util.function.IntPredicate)",
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/EmulatedInterfacesTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/EmulatedInterfacesTest.java
index b21dada..a36977a 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/EmulatedInterfacesTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/EmulatedInterfacesTest.java
@@ -6,6 +6,7 @@
import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.D8_L8DEBUG;
import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.D8_L8SHRINK;
+import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.JDK11;
import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.getJdk8Jdk11;
import static com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringForTesting.getEmulateLibraryClassNameSuffix;
import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
@@ -74,7 +75,7 @@
private void assertEmulateInterfaceClassesPresentWithDispatchMethods(CodeInspector inspector) {
List<FoundClassSubject> emulatedInterfaces = getEmulatedInterfaces(inspector);
- int numDispatchClasses = 9;
+ int numDispatchClasses = libraryDesugaringSpecification == JDK11 ? 10 : 9;
assertThat(inspector.clazz("j$.util.Map$Entry$-EL"), not(isPresent()));
assertEquals(numDispatchClasses, emulatedInterfaces.size());
for (FoundClassSubject clazz : emulatedInterfaces) {
diff --git a/src/test/java17/com/android/tools/r8/jdk17/desugaredlibrary/desugaredlibrary/CharSequenceIsEmptyTest.java b/src/test/java17/com/android/tools/r8/jdk17/desugaredlibrary/desugaredlibrary/CharSequenceIsEmptyTest.java
new file mode 100644
index 0000000..6a7fc7e
--- /dev/null
+++ b/src/test/java17/com/android/tools/r8/jdk17/desugaredlibrary/desugaredlibrary/CharSequenceIsEmptyTest.java
@@ -0,0 +1,160 @@
+// Copyright (c) 2026, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.jdk17.desugaredlibrary.desugaredlibrary;
+
+import static com.android.tools.r8.desugar.desugaredlibrary.test.CompilationSpecification.SPECIFICATIONS_WITH_CF2CF;
+import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.JDK11;
+import static com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.JDK11_PATH;
+
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryTestBase;
+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.StringUtils;
+import com.google.common.collect.ImmutableList;
+import java.nio.CharBuffer;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class CharSequenceIsEmptyTest extends DesugaredLibraryTestBase {
+ private final TestParameters parameters;
+ private final LibraryDesugaringSpecification libraryDesugaringSpecification;
+ private final CompilationSpecification compilationSpecification;
+
+ private static final String EXPECTED_OUTPUT =
+ StringUtils.lines(
+ "side-effect",
+ "true",
+ "side-effect",
+ "true",
+ "true",
+ "true",
+ "false",
+ "false",
+ "false",
+ "false",
+ "true",
+ "true",
+ "true",
+ "true");
+
+ @Parameters(name = "{0}, spec: {1}, {2}")
+ public static List<Object[]> data() {
+ return buildParameters(
+ getTestParameters()
+ .withDexRuntimes()
+ .withAllApiLevels()
+ .withApiLevel(AndroidApiLevel.O)
+ .build(),
+ ImmutableList.of(JDK11, JDK11_PATH),
+ SPECIFICATIONS_WITH_CF2CF);
+ }
+
+ public CharSequenceIsEmptyTest(
+ TestParameters parameters,
+ LibraryDesugaringSpecification libraryDesugaringSpecification,
+ CompilationSpecification compilationSpecification) {
+ this.parameters = parameters;
+ this.libraryDesugaringSpecification = libraryDesugaringSpecification;
+ this.compilationSpecification = compilationSpecification;
+ }
+
+ @Test
+ public void test() throws Throwable {
+ testForDesugaredLibrary(parameters, libraryDesugaringSpecification, compilationSpecification)
+ .addInnerClassesAndStrippedOuter(getClass())
+ .addKeepMainRule(Main.class)
+ .noMinification()
+ // Need CharSequence#isEmpty in library.
+ .overrideLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.BAKLAVA))
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutput(EXPECTED_OUTPUT);
+ }
+
+ public static class Main {
+
+ public static class MyCharSeq implements CharSequence {
+
+ @Override
+ public int length() {
+ return 0;
+ }
+
+ @Override
+ public char charAt(int index) {
+ return 0;
+ }
+
+ @Override
+ public CharSequence subSequence(int start, int end) {
+ return null;
+ }
+
+ @Override
+ public String toString() {
+ return "M";
+ }
+ }
+
+ public static class MyCharSeqOverride implements CharSequence {
+
+ @Override
+ public boolean isEmpty() {
+ System.out.println("side-effect");
+ return CharSequence.super.isEmpty();
+ }
+
+ @Override
+ public int length() {
+ return 0;
+ }
+
+ @Override
+ public char charAt(int index) {
+ return 0;
+ }
+
+ @Override
+ public CharSequence subSequence(int start, int end) {
+ return null;
+ }
+
+ @Override
+ public String toString() {
+ return "M";
+ }
+ }
+
+ public static void main(String[] args) {
+ MyCharSeqOverride seqOver = new MyCharSeqOverride();
+ System.out.println(seqOver.isEmpty());
+ System.out.println(isEmpty(seqOver));
+ MyCharSeq seq = new MyCharSeq();
+ System.out.println(seq.isEmpty());
+ System.out.println(isEmpty(seq));
+ CharBuffer buffer = CharBuffer.wrap("buffer");
+ System.out.println(buffer.isEmpty());
+ System.out.println(isEmpty(buffer));
+ String string = "string";
+ System.out.println(string.isEmpty());
+ System.out.println(isEmpty(string));
+ StringBuilder sb = new StringBuilder();
+ System.out.println(sb.isEmpty());
+ System.out.println(isEmpty(sb));
+ System.out.println(sb.toString().isEmpty());
+ System.out.println(isEmpty(sb.toString()));
+ }
+
+ public static boolean isEmpty(CharSequence seq) {
+ return seq.isEmpty();
+ }
+ }
+}
diff --git a/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1 b/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
index fd670de..f249c98 100644
--- a/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
+++ b/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
@@ -1 +1 @@
-a7a396a5037e357c0a094f647c6e0b1599a04abd
\ No newline at end of file
+1063e8a87e27919ebbe523fb81f64405c9382956
\ No newline at end of file
