commit 2aae21a19f353b3480aef282164c564d50493328
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Sep 25 15:30:24 2023 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Sep 27 06:05:08 2023 +0000
tree 92d1766edf1c758d1f1a3200a3effcd9cc5f1950
parent 1f07fb5e6f0e10320cb44d3653d4b31e86e318cf

Clean-up method strategy now that aggressive overload is not used

Change-Id: I2f8aeb86109dd96a92e76c0026a70d41c02464d4

src/main/java/com/android/tools/r8/utils/MethodSignatureEquivalence.java

diff --git a/src/main/java/com/android/tools/r8/utils/MethodSignatureEquivalence.java b/src/main/java/com/android/tools/r8/utils/MethodSignatureEquivalence.java
index 6a8d2c9..01f4031 100644
--- a/src/main/java/com/android/tools/r8/utils/MethodSignatureEquivalence.java
+++ b/src/main/java/com/android/tools/r8/utils/MethodSignatureEquivalence.java
@@ -13,38 +13,21 @@
  */
 public class MethodSignatureEquivalence extends Equivalence<DexMethod> {
 
-  private static final MethodSignatureEquivalence INSTANCE = new MethodSignatureEquivalence(false);
+  private static final MethodSignatureEquivalence INSTANCE = new MethodSignatureEquivalence();
 
-  private static final MethodSignatureEquivalence INSTANCE_IGNORE_NAME =
-      new MethodSignatureEquivalence(true);
-
-  private final boolean ignoreName;
-
-  private MethodSignatureEquivalence(boolean ignoreName) {
-    this.ignoreName = ignoreName;
-  }
+  private MethodSignatureEquivalence() {}
 
   public static MethodSignatureEquivalence get() {
     return INSTANCE;
   }
 
-  public static MethodSignatureEquivalence getEquivalenceIgnoreName() {
-    return INSTANCE_IGNORE_NAME;
-  }
-
   @Override
   protected boolean doEquivalent(DexMethod a, DexMethod b) {
-    if (ignoreName) {
-      return a.proto.equals(b.proto);
-    }
     return a.name.equals(b.name) && a.proto.equals(b.proto);
   }
 
   @Override
   protected int doHash(DexMethod method) {
-    if (ignoreName) {
-      return method.proto.hashCode();
-    }
     return method.name.hashCode() * 31 + method.proto.hashCode();
   }
 }