commit 1fb65eb617306c3eea481d70f7052c8ffce52b4f
author Søren Gjesse <sgjesse@google.com> Thu May 27 12:14:21 2021 +0200
committer Søren Gjesse <sgjesse@google.com> Thu May 27 13:37:14 2021 +0000
tree 9645318247a30f9f02a9f237118d83fd84c11ffb
parent 123d41ad89d1e6e4144b80e7243a5c5b28ebbeb4

Don't give desugar warning for non-interface static invoke

Bug: 189411290
Change-Id: Icb0fe78be2f69059ed70ce3ece38cb26900cb972

src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java
index 782ff63..bdd6064 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/itf/InterfaceMethodRewriter.java
@@ -345,8 +345,8 @@
       // behavior.
       if (cfInvoke.isInterface()) {
         leavingStaticInvokeToInterface(context);
+        warnMissingType(context, invokedMethod.holder);
       }
-      warnMissingType(context, invokedMethod.holder);
       return;
     }
 

src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/NoMissingClassWarningForNonInterfaceInvoke.java

diff --git a/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/NoMissingClassWarningForNonInterfaceInvoke.java b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/NoMissingClassWarningForNonInterfaceInvoke.java
new file mode 100644
index 0000000..08df42c
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/desugar/staticinterfacemethod/NoMissingClassWarningForNonInterfaceInvoke.java
@@ -0,0 +1,46 @@
+// Copyright (c) 2021, 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.desugar.staticinterfacemethod;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class NoMissingClassWarningForNonInterfaceInvoke extends TestBase {
+
+  private final TestParameters parameters;
+
+  @Parameterized.Parameters(name = "{0}")
+  public static TestParametersCollection data() {
+    return getTestParameters().withAllRuntimes().withAllApiLevelsAlsoForCf().build();
+  }
+
+  public NoMissingClassWarningForNonInterfaceInvoke(TestParameters parameters) {
+    this.parameters = parameters;
+  }
+
+  @Test
+  public void test() throws Exception {
+    testForD8(Backend.CF)
+        .addProgramClasses(TestClass.class)
+        .setMinApi(parameters.getApiLevel())
+        .setIntermediate(true)
+        .compile()
+        .assertNoWarningMessages();
+  }
+
+  static class MissingClass {
+    static void test() {}
+  }
+
+  static class TestClass {
+    public static void main(String[] args) {
+      MissingClass.test();
+    }
+  }
+}