commit bfd6dccb5d56a597ac0aa4bd518fb604f0a27599
author Søren Gjesse <sgjesse@google.com> Mon Jun 03 16:37:19 2024 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Jun 03 14:41:20 2024 +0000
tree 92e50522beb019ca67767130ae63e7edda2fb607
parent cebd7fa8add4216e1a11441a134ac7d845c97141

Update status for tests on Art 15

Bug: b/343127842
Change-Id: Iadc143f6c63cab993de1c5d40fde8e2265dfe238

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 7f177e7..1a92b00 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -3030,9 +3030,9 @@
   //
   // This can happen with D8, but is most likely to hit in R8 after inlining.
   //
-  // Fixed in Android V.
+  // Not known when/if Art will fix this.
   public boolean canHaveArtFalsyInstanceOfVerifierBug() {
-    return canHaveBugPresentUntilInclusive(AndroidApiLevel.U);
+    return true;
   }
 
   // Some Art Lollipop version do not deal correctly with long-to-int conversions.

src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java

diff --git a/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java b/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
index ee2f958..535c25f 100644
--- a/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunExamplesAndroidOTest.java
@@ -97,6 +97,10 @@
               Version.V14_0_0,
               // TODO(120402963) Triage.
               ImmutableList.of("invokecustom-with-shrinking", "invokecustom2-with-shrinking"))
+          .put(
+              Version.V15_0_0,
+              // TODO(120402963) Triage.
+              ImmutableList.of("invokecustom-with-shrinking", "invokecustom2-with-shrinking"))
           .put(Version.DEFAULT, ImmutableList.of())
           .build();
 

src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java

diff --git a/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java b/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java
index f65ed07..0b3baa3 100644
--- a/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java
+++ b/src/test/java/com/android/tools/r8/RunExamplesAndroidOTest.java
@@ -317,6 +317,11 @@
             ImmutableList.of(
                 // TODO(b/120402963): Triage.
                 "invokecustom", "invokecustom2"))
+        .put(
+            Version.V15_0_0,
+            ImmutableList.of(
+                // TODO(b/120402963): Triage.
+                "invokecustom", "invokecustom2"))
         .put(DexVm.Version.DEFAULT, ImmutableList.of());
     failsOn = builder.build();
   }

src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceMethodDesugaringTests.java

diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceMethodDesugaringTests.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceMethodDesugaringTests.java
index 96b1358..dd016a2 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceMethodDesugaringTests.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceMethodDesugaringTests.java
@@ -138,7 +138,7 @@
   }
 
   @Test
-  @IgnoreForRangeOfVmVersions(from = Version.V7_0_0, to = Version.V14_0_0) // No desugaring
+  @IgnoreForRangeOfVmVersions(from = Version.V7_0_0, to = Version.V15_0_0) // No desugaring
   public void testInvokeDefault1() throws Exception {
     ensureCustomCheck(
         (javaResult, d8Result, r8Result, r8ShakenResult) -> {