commit bca9efd8de9ca3af84deef1855671a67ee1afb43
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Jan 03 12:40:59 2024 +0100
committer Christoffer Adamsen <christofferqa@google.com> Wed Jan 03 11:44:20 2024 +0000
tree 1b4b31dd4a8dcccfe5b6a28abd1b05f36f2a87e8
parent 4dad934c6ce7cebec383ab791353bdaad3a620d0

Fix missing collision check in class merging fixup

Fixes: b/318341023
Change-Id: I015d5a1961a116858f3f4b0931fabe05a6bb592e

src/main/java/com/android/tools/r8/classmerging/ClassMergerTreeFixer.java

diff --git a/src/main/java/com/android/tools/r8/classmerging/ClassMergerTreeFixer.java b/src/main/java/com/android/tools/r8/classmerging/ClassMergerTreeFixer.java
index 8bf6828..0417118 100644
--- a/src/main/java/com/android/tools/r8/classmerging/ClassMergerTreeFixer.java
+++ b/src/main/java/com/android/tools/r8/classmerging/ClassMergerTreeFixer.java
@@ -184,8 +184,9 @@
     if (newMethodSignature == null) {
       newMethodSignature = fixupMethodReference(originalMethodReference).getSignature();
 
-      // If the signature is already reserved by another interface, find a fresh one.
-      if (reservedInterfaceSignatures.containsValue(newMethodSignature)) {
+      // If the signature is kept or already reserved by another interface, find a fresh one.
+      if (keptSignatures.contains(newMethodSignature)
+          || reservedInterfaceSignatures.containsValue(newMethodSignature)) {
         DexString name =
             dexItemFactory.createGloballyFreshMemberString(
                 originalMethodReference.getName().toSourceString());