commit ae0660b12f1b129cab2dcd5d2da16e96287d7d01
author Morten Krogh-Jespersen <mkroghj@google.com> Thu Oct 14 13:07:33 2021 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu Oct 14 14:47:35 2021 +0000
tree 7fc0cc5152aa5dca8cf177af37f3fa7c5de02369
parent 158ef2d4edcb9907084392e8be492bdacadc79e4

Remove final assume from kotlin tests not running coroutines

Bug: 185493636
Change-Id: Ib016c8a20e3ff00871523e337bc1989b7f41c072

src/main/java/com/android/tools/r8/ir/code/InvokeVirtual.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/InvokeVirtual.java b/src/main/java/com/android/tools/r8/ir/code/InvokeVirtual.java
index e063b8f..9179014 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InvokeVirtual.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InvokeVirtual.java
@@ -132,8 +132,7 @@
                   receiverLowerBoundType);
     } else {
       // In D8, allow lookupSingleTarget() to be used for finding final library methods. This is
-      // used
-      // for library modeling.
+      // used for library modeling.
       DexType holder = method.holder;
       if (holder.isClassType()) {
         DexClass clazz = appView.definitionFor(holder);

src/test/java/com/android/tools/r8/kotlin/R8KotlinAccessorTest.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/R8KotlinAccessorTest.java b/src/test/java/com/android/tools/r8/kotlin/R8KotlinAccessorTest.java
index 282d8d7..99a757b 100644
--- a/src/test/java/com/android/tools/r8/kotlin/R8KotlinAccessorTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/R8KotlinAccessorTest.java
@@ -8,7 +8,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
 
 import com.android.tools.r8.KotlinTestParameters;
 import com.android.tools.r8.R8TestBuilder;
@@ -388,8 +387,6 @@
 
   @Test
   public void testAccessorForInnerClassIsRemovedWhenNotUsed() throws Exception {
-    // TODO(b/185493636): Kotlinc 1.5 generated property accessors are not removed.
-    assumeTrue(kotlinc.isNot(KOTLINC_1_5_0));
     String mainClass =
         addMainToClasspath(
             "accessors.PropertyAccessorForInnerClassKt", "noUseOfPropertyAccessorFromInnerClass");
@@ -397,7 +394,12 @@
         .inspect(
             inspector -> {
               // Class is removed because the instantiation of the inner class has no side effects.
-              checkClassIsRemoved(inspector, PROPERTY_ACCESS_FOR_INNER_CLASS.getClassName());
+              // TODO(b/202952541): Should be able to remove class.
+              if (kotlinc.is(KOTLINC_1_5_0) && testParameters.isDexRuntime()) {
+                checkClassIsKept(inspector, PROPERTY_ACCESS_FOR_INNER_CLASS.getClassName());
+              } else {
+                checkClassIsRemoved(inspector, PROPERTY_ACCESS_FOR_INNER_CLASS.getClassName());
+              }
             });
   }