commit 7804151e7349919034277056b46e09e8046d1f3c
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Feb 28 08:49:03 2022 +0100
committer Christoffer Adamsen <christofferqa@google.com> Mon Feb 28 07:59:24 2022 +0000
tree 968851eaad8597e4adf3b4eb31106020c240d08d
parent 67fb14a970de14375e60e47d6ea36bb27b04200a

Fix nontermination from proto normalizer

Change-Id: Iedc9ce7a0c3f8c4972e25298b4f40e77e84b1e03

src/main/java/com/android/tools/r8/optimize/proto/ProtoNormalizer.java

diff --git a/src/main/java/com/android/tools/r8/optimize/proto/ProtoNormalizer.java b/src/main/java/com/android/tools/r8/optimize/proto/ProtoNormalizer.java
index 245a981..0213d86 100644
--- a/src/main/java/com/android/tools/r8/optimize/proto/ProtoNormalizer.java
+++ b/src/main/java/com/android/tools/r8/optimize/proto/ProtoNormalizer.java
@@ -392,6 +392,7 @@
         do {
           DexString newMethodName = dexItemFactory.createString(newMethodBaseName + "$" + index);
           newMethodSignature = newMethodSignature.withName(newMethodName);
+          index++;
         } while (newMethodSignatures.containsValue(newMethodSignature));
       }
       if (reserve) {