commit 7ce7d18051cf960c577d48189ad0953b8ef8534b
author Christoffer Adamsen <christofferqa@google.com> Tue Sep 10 14:35:54 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Tue Sep 10 14:35:54 2024 +0200
tree 0c7e8eb31e2b721a41337229f81ee3629a823e32
parent 39ec4b131fbe745ef0f2100d439074b3804601aa

Fix inadequate grouping of if rules during evaluation

Bug: b/206086945
Change-Id: Ib26fe5ef1f41ed9bfaa91b584c0ff9247bcec1e6

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

diff --git a/src/main/java/com/android/tools/r8/shaking/IfRuleClassPartEquivalence.java b/src/main/java/com/android/tools/r8/shaking/IfRuleClassPartEquivalence.java
index 527565f..9501279 100644
--- a/src/main/java/com/android/tools/r8/shaking/IfRuleClassPartEquivalence.java
+++ b/src/main/java/com/android/tools/r8/shaking/IfRuleClassPartEquivalence.java
@@ -5,7 +5,6 @@
 package com.android.tools.r8.shaking;
 
 import com.google.common.base.Equivalence;
-import com.google.common.collect.Iterables;
 import java.util.Objects;
 
 public class IfRuleClassPartEquivalence extends Equivalence<ProguardIfRule> {
@@ -53,7 +52,6 @@
                 ? rule.getInheritanceClassName().hashCode()
                 : 0);
     result = 3 * result + (rule.getInheritanceIsImplements() ? 1 : 0);
-    result = 3 * result + Iterables.size(rule.subsequentRule.getWildcards());
     return result;
   }
 }