commit a5f27f5ffeabfe61816c15d9dd1b89758b846e6c
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Sep 27 10:57:34 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Sep 27 08:58:02 2021 +0000
tree 24892405c2a911372e3d02c34668b24e4360f00f
parent 4858ddf38eaa6c78d8619b917159ae509e1bf426

Mark -checkdiscard rules with matching items as used

Change-Id: I8668748db00f8369feaa8f6c10afeae472ca7def

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 2d331d3..3dc1bc5 100644
--- a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
+++ b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
@@ -1317,7 +1317,6 @@
     private void evaluateCheckDiscardRule(DexProgramClass clazz, ProguardCheckDiscardRule rule) {
       if (rule.getMemberRules().isEmpty()) {
         evaluateCheckDiscardClassAndAllMembersRule(clazz, rule);
-        rule.markAsUsed();
       } else if (clazz.hasFields() || clazz.hasMethods()) {
         markMatchingFields(clazz, rule.getMemberRules(), rule, null, null);
         markMatchingMethods(clazz, rule.getMemberRules(), rule, null, null);
@@ -1329,11 +1328,13 @@
         DexProgramClass clazz, ProguardCheckDiscardRule rule) {
       setCheckDiscarded(clazz);
       clazz.forEachProgramMember(this::setCheckDiscarded);
+      rule.markAsUsed();
     }
 
     private void evaluateCheckDiscardMemberRule(
         ProgramMember<?, ?> member, ProguardCheckDiscardRule rule) {
       setCheckDiscarded(member);
+      rule.markAsUsed();
     }
 
     private void setCheckDiscarded(ProgramDefinition definition) {

src/test/java/com/android/tools/r8/checkdiscarded/CheckDiscardedTest.java

diff --git a/src/test/java/com/android/tools/r8/checkdiscarded/CheckDiscardedTest.java b/src/test/java/com/android/tools/r8/checkdiscarded/CheckDiscardedTest.java
index da2e4cb..389d347 100644
--- a/src/test/java/com/android/tools/r8/checkdiscarded/CheckDiscardedTest.java
+++ b/src/test/java/com/android/tools/r8/checkdiscarded/CheckDiscardedTest.java
@@ -72,7 +72,7 @@
     options.enableInlining = false;
   }
 
-  private String checkDiscardRule(boolean member, Class annotation) {
+  private String checkDiscardRule(boolean member, Class<?> annotation) {
     if (member) {
       return "-checkdiscard class * { @" + annotation.getName() + " *; }";
     } else {