commit 2b6a05dc04f6d59ed9bb3f1ff7eb580f5a2f9fd4
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 31 15:10:51 2023 +0100
committer Christoffer Adamsen <christofferqa@google.com> Tue Jan 31 14:11:05 2023 +0000
tree 3211335f3fd42b5ea849ad570bfbb8f8e9fcc813
parent 3376ec6bc675506c32a4b8d46662e42e883c1d77

Fix DefaultInterfaceMethodProfileRewritingTest failure

Change-Id: I33df8d43a5bc08073af654573a72e9498e83434c

src/test/java/com/android/tools/r8/profile/art/completeness/DefaultInterfaceMethodProfileRewritingTest.java

diff --git a/src/test/java/com/android/tools/r8/profile/art/completeness/DefaultInterfaceMethodProfileRewritingTest.java b/src/test/java/com/android/tools/r8/profile/art/completeness/DefaultInterfaceMethodProfileRewritingTest.java
index 64191b4..194269e 100644
--- a/src/test/java/com/android/tools/r8/profile/art/completeness/DefaultInterfaceMethodProfileRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/profile/art/completeness/DefaultInterfaceMethodProfileRewritingTest.java
@@ -43,7 +43,7 @@
         .addArtProfileForRewriting(getArtProfile())
         .setMinApi(parameters.getApiLevel())
         .compile()
-        .inspectResidualArtProfile(this::inspect)
+        .inspectResidualArtProfile(this::inspectD8)
         .run(parameters.getRuntime(), Main.class)
         .assertSuccessWithOutputLines("Hello, world!");
   }
@@ -59,7 +59,7 @@
         .enableNoHorizontalClassMergingAnnotations()
         .setMinApi(parameters.getApiLevel())
         .compile()
-        .inspectResidualArtProfile(this::inspect)
+        .inspectResidualArtProfile(this::inspectR8)
         .run(parameters.getRuntime(), Main.class)
         .assertSuccessWithOutputLines("Hello, world!");
   }
@@ -70,8 +70,25 @@
         .build();
   }
 
-  private void inspect(ArtProfileInspector profileInspector, CodeInspector inspector) {
-    if (parameters.canUseDefaultAndStaticInterfaceMethodsWhenDesugaring()) {
+  private void inspectD8(ArtProfileInspector profileInspector, CodeInspector inspector) {
+    inspect(
+        profileInspector,
+        inspector,
+        parameters.canUseDefaultAndStaticInterfaceMethodsWhenDesugaring());
+  }
+
+  private void inspectR8(ArtProfileInspector profileInspector, CodeInspector inspector) {
+    inspect(
+        profileInspector,
+        inspector,
+        parameters.isCfRuntime() || parameters.canUseDefaultAndStaticInterfaceMethods());
+  }
+
+  private void inspect(
+      ArtProfileInspector profileInspector,
+      CodeInspector inspector,
+      boolean canUseDefaultAndStaticInterfaceMethods) {
+    if (canUseDefaultAndStaticInterfaceMethods) {
       ClassSubject iClassSubject = inspector.clazz(I.class);
       assertThat(iClassSubject, isPresent());