commit c021c7bba1b6abd79f3734b5e2e6ba07a5aa58bc
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Apr 26 09:41:08 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Apr 26 10:25:45 2021 +0000
tree 04db970ac6007e0eb3b2476b3ed74761df0dc51f
parent a513932ac02ea80f7b7243ebca70674c26f2d9b3

Keep indirectly referenced static methods in full mode

Change-Id: I506e24d9d35dcea0c1e69cb3af61f225535c0827

src/main/java/com/android/tools/r8/shaking/RootSetUtils.java

diff --git a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
index e78f53b..72a0a0b 100644
--- a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
+++ b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
@@ -488,16 +488,17 @@
           break;
         }
         // In compat mode traverse all direct methods in the hierarchy.
-        if (currentClass == clazz || options.forceProguardCompatibility) {
-          currentClass
-              .directMethods()
-              .forEach(
-                  method -> {
-                    DexDefinition precondition =
-                        testAndGetPrecondition(method, preconditionSupplier);
-                    markMethod(method, memberKeepRules, methodsMarked, rule, precondition, ifRule);
-                  });
-        }
+        currentClass
+            .getMethodCollection()
+            .forEachDirectMethodMatching(
+                method ->
+                    currentClass == clazz
+                        || (method.isStatic() && !method.isPrivate() && !method.isInitializer())
+                        || options.forceProguardCompatibility,
+                method -> {
+                  DexDefinition precondition = testAndGetPrecondition(method, preconditionSupplier);
+                  markMethod(method, memberKeepRules, methodsMarked, rule, precondition, ifRule);
+                });
         currentClass
             .virtualMethods()
             .forEach(

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

diff --git a/src/test/java/com/android/tools/r8/R8TestBuilder.java b/src/test/java/com/android/tools/r8/R8TestBuilder.java
index 19b414a..d85d8d9 100644
--- a/src/test/java/com/android/tools/r8/R8TestBuilder.java
+++ b/src/test/java/com/android/tools/r8/R8TestBuilder.java
@@ -309,6 +309,11 @@
     return self();
   }
 
+  public T allowUnnecessaryDontWarnWildcards() {
+    return addOptionsModification(
+        options -> options.testing.allowUnnecessaryDontWarnWildcards = true);
+  }
+
   public T allowUnusedDontWarnKotlinReflectJvmInternal() {
     addOptionsModification(
         options ->

src/test/java/com/android/tools/r8/internal/ClankDepsTest.java

diff --git a/src/test/java/com/android/tools/r8/internal/ClankDepsTest.java b/src/test/java/com/android/tools/r8/internal/ClankDepsTest.java
index cebfab3..82570e9 100644
--- a/src/test/java/com/android/tools/r8/internal/ClankDepsTest.java
+++ b/src/test/java/com/android/tools/r8/internal/ClankDepsTest.java
@@ -41,8 +41,9 @@
         .addDontWarn("dalvik.system.VMStack")
         .addDontWarn("zzz.com.facebook.litho.R$id")
         .addDontWarn("com.google.android.libraries.elements.R$id")
-        .allowUnusedProguardConfigurationRules()
         .allowUnusedDontWarnPatterns()
+        .allowUnusedProguardConfigurationRules()
+        .allowUnnecessaryDontWarnWildcards()
         .setMinApi(AndroidApiLevel.N)
         .compileWithExpectedDiagnostics(TestDiagnosticMessages::assertOnlyInfos);
   }

src/test/java/com/android/tools/r8/shaking/keep/IndirectKeepStaticMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/keep/IndirectKeepStaticMethodTest.java b/src/test/java/com/android/tools/r8/shaking/keep/IndirectKeepStaticMethodTest.java
new file mode 100644
index 0000000..3e20dcd
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/shaking/keep/IndirectKeepStaticMethodTest.java
@@ -0,0 +1,59 @@
+// 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.shaking.keep;
+
+import com.android.tools.r8.NoVerticalClassMerging;
+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;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class IndirectKeepStaticMethodTest extends TestBase {
+
+  private final TestParameters parameters;
+
+  @Parameters(name = "{0}")
+  public static TestParametersCollection data() {
+    return getTestParameters().withAllRuntimesAndApiLevels().build();
+  }
+
+  public IndirectKeepStaticMethodTest(TestParameters parameters) {
+    this.parameters = parameters;
+  }
+
+  @Test
+  public void test() throws Exception {
+    testForR8(parameters.getBackend())
+        .addProgramClasses(A.class, B.class)
+        .addKeepRules("-keep class " + B.class.getTypeName() + " {", "  static void m();", "}")
+        .enableNoVerticalClassMergingAnnotations()
+        .setMinApi(parameters.getApiLevel())
+        .compile()
+        .addRunClasspathFiles(buildOnDexRuntime(parameters, Main.class))
+        .run(parameters.getRuntime(), Main.class)
+        .assertSuccessWithOutputLines("A");
+  }
+
+  static class Main {
+
+    public static void main(String[] args) {
+      B.m();
+    }
+  }
+
+  @NoVerticalClassMerging
+  static class A {
+
+    static void m() {
+      System.out.println("A");
+    }
+  }
+
+  static class B extends A {}
+}