commit 0bb9a6033e4b34c47385b765b23ac7c497c773a9
author Christoffer Adamsen <christofferqa@google.com> Tue Jun 11 13:29:03 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Tue Jun 11 11:30:02 2024 +0000
tree be61d102fb753990d7033c77e982c56b8698babe
parent a2b34c52cbc82a8b7b491ec02664d49af42cd1f2

Don't do single caller inlining if shrinking is disallowed

Bug: b/344912795
Change-Id: I33719ce1bc6085f1c8b8cf6b4dd23285a60b16b1

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

diff --git a/src/main/java/com/android/tools/r8/shaking/KeepMethodInfo.java b/src/main/java/com/android/tools/r8/shaking/KeepMethodInfo.java
index f9038bf..879369c 100644
--- a/src/main/java/com/android/tools/r8/shaking/KeepMethodInfo.java
+++ b/src/main/java/com/android/tools/r8/shaking/KeepMethodInfo.java
@@ -168,7 +168,9 @@
   }
 
   public boolean isSingleCallerInliningAllowed(GlobalKeepInfoConfiguration configuration) {
-    return internalIsSingleCallerInliningAllowed();
+    return isOptimizationAllowed(configuration)
+        && isShrinkingAllowed(configuration)
+        && internalIsSingleCallerInliningAllowed();
   }
 
   boolean internalIsSingleCallerInliningAllowed() {

src/test/java/com/android/tools/r8/regress/Regress338346285.java

diff --git a/src/test/java/com/android/tools/r8/regress/Regress338346285.java b/src/test/java/com/android/tools/r8/regress/Regress338346285.java
new file mode 100644
index 0000000..c88ecf7
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/regress/Regress338346285.java
@@ -0,0 +1,60 @@
+// Copyright (c) 2024, 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.regress;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+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 Regress338346285 extends TestBase {
+
+  private final TestParameters parameters;
+
+  @Parameterized.Parameters(name = "{0}")
+  public static TestParametersCollection data() {
+    return getTestParameters().withAllApiLevels().withAllRuntimes().build();
+  }
+
+  public Regress338346285(TestParameters parameters) {
+    this.parameters = parameters;
+  }
+
+  @Test
+  public void testR8() throws Exception {
+    testForR8(parameters.getBackend())
+        .addInnerClasses(getClass())
+        .addKeepRules("-keep,allowoptimization class " + TestClass.class.getTypeName() + " { *; }")
+        .setMinApi(parameters)
+        .compile()
+        .inspect(
+            codeInspector -> {
+              assertThat(
+                  codeInspector
+                      .clazz(TestClass.class)
+                      .uniqueMethodWithFinalName("shouldNotBeRemoved"),
+                  isPresent());
+            })
+        .run(parameters.getRuntime(), TestClass.class)
+        .assertSuccessWithOutputLines("foo", "bar", "foobar");
+  }
+
+  public static class TestClass {
+    public void shouldNotBeRemoved() {
+      System.out.println("foo");
+      System.out.println("bar");
+      System.out.println("foobar");
+    }
+
+    public static void main(String[] args) {
+      new TestClass().shouldNotBeRemoved();
+    }
+  }
+}