Reproduce and fix inadequate keeping of Gson <init>s
Fixes: b/394185143
Change-Id: I4657735beffd0b7899323c8b7fba499eee45dfee
diff --git a/src/main/java/com/android/tools/r8/shaking/ifrules/MaterializedSubsequentRulesOptimizer.java b/src/main/java/com/android/tools/r8/shaking/ifrules/MaterializedSubsequentRulesOptimizer.java
index adb78d5..ba7a84c 100644
--- a/src/main/java/com/android/tools/r8/shaking/ifrules/MaterializedSubsequentRulesOptimizer.java
+++ b/src/main/java/com/android/tools/r8/shaking/ifrules/MaterializedSubsequentRulesOptimizer.java
@@ -17,7 +17,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -101,7 +100,7 @@
memberRules = new ArrayList<>(representativeKeepRule.getMemberRules());
memberRules.set(memberRuleWithBackReferenceIndex, replacementMemberRule);
} else {
- memberRules = Collections.emptyList();
+ memberRules = representativeKeepRule.getMemberRules();
}
ProguardKeepRule replacementKeepRule =
new ProguardKeepRule(
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleReductionWithMembersTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleReductionWithMembersTest.java
new file mode 100644
index 0000000..13664ac
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/IfRuleReductionWithMembersTest.java
@@ -0,0 +1,63 @@
+// Copyright (c) 2025, 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.ifrule;
+
+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;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class IfRuleReductionWithMembersTest extends TestBase {
+
+ @Parameter(0)
+ public TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ @Test
+ public void test() throws Exception {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(getClass())
+ .addKeepMainRule(Main.class)
+ .addKeepRules(
+ "-if class * {",
+ " static boolean *;",
+ "}",
+ "-keep class <1> { static void unused(); }")
+ .setMinApi(parameters)
+ .compile()
+ .inspect(
+ inspector ->
+ assertThat(
+ inspector.clazz(Main.class).uniqueMethodWithOriginalName("unused"),
+ isPresent()))
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("true", "true");
+ }
+
+ static class Main {
+
+ static boolean f = System.currentTimeMillis() > 0;
+
+ static boolean g = System.currentTimeMillis() > 0;
+
+ public static void main(String[] args) {
+ System.out.println(f);
+ System.out.println(g);
+ }
+
+ static void unused() {}
+ }
+}
