commit 9a3743f9ab80d6195289796a12f57af84f1a6e25
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Dec 01 13:57:51 2023 +0100
committer Christoffer Adamsen <christofferqa@google.com> Mon Dec 04 07:20:29 2023 +0000
tree 6440fe736747da9b05d20de0949006d8d77c8c67
parent f748d174fc9b0a9606f70fc9a6350e81ebff0857

Account for moved synthetic methods in art profile

Change-Id: I54f1810556945c88ec13292be8ff567f432ba983

src/main/java/com/android/tools/r8/profile/rewriting/ProfileAdditions.java

diff --git a/src/main/java/com/android/tools/r8/profile/rewriting/ProfileAdditions.java b/src/main/java/com/android/tools/r8/profile/rewriting/ProfileAdditions.java
index b33a217..877df9a 100644
--- a/src/main/java/com/android/tools/r8/profile/rewriting/ProfileAdditions.java
+++ b/src/main/java/com/android/tools/r8/profile/rewriting/ProfileAdditions.java
@@ -247,7 +247,13 @@
         .forEach(classRuleBuilder -> ruleAdditionsSorted.add(classRuleBuilder.build()));
     methodRuleAdditions
         .values()
-        .forEach(methodRuleBuilder -> ruleAdditionsSorted.add(methodRuleBuilder.build()));
+        .forEach(
+            methodRuleBuilder -> {
+              MethodRule methodRule = methodRuleBuilder.build();
+              if (!methodRuleRemovals.contains(methodRule.getReference())) {
+                ruleAdditionsSorted.add(methodRule);
+              }
+            });
     ruleAdditionsSorted.sort(getRuleComparator());
     ruleAdditionsSorted.forEach(profileBuilder::addRule);