commit bd2d5b231908ff654c41ed44aef1ecb48909415e
author Christoffer Adamsen <christofferqa@google.com> Wed Jan 29 14:14:31 2025 +0100
committer Rico Wind <ricow@google.com> Wed Jan 29 05:29:37 2025 -0800
tree 2b2b85904bd3122a10afe21753c23b788b1818c9
parent e0661e5cd5e483f5b1abd9c04ad2f5f93cba1c69

Fix errorprone warnings for LineNumberOptimizer

Change-Id: I43ef31224f1b38eeac17b618f0682afa9a76a3f7

src/main/java/com/android/tools/r8/utils/positions/LineNumberOptimizer.java

diff --git a/src/main/java/com/android/tools/r8/utils/positions/LineNumberOptimizer.java b/src/main/java/com/android/tools/r8/utils/positions/LineNumberOptimizer.java
index 5da8a1e..bcfdb10 100644
--- a/src/main/java/com/android/tools/r8/utils/positions/LineNumberOptimizer.java
+++ b/src/main/java/com/android/tools/r8/utils/positions/LineNumberOptimizer.java
@@ -100,7 +100,6 @@
         || newMapVersion.isUnknown();
   }
 
-  @SuppressWarnings("ReferenceEquality")
   public static ClassNameMapper run(
       AppView<?> appView,
       AndroidApp inputApp,
@@ -121,7 +120,7 @@
     // Collect which files contain which classes that need to have their line numbers optimized.
     for (DexProgramClass clazz : appView.appInfo().classes()) {
       if (shouldRun(clazz, appView)) {
-        run(
+        runForClass(
             clazz,
             appView,
             representation,
@@ -146,7 +145,7 @@
     }
   }
 
-  private static void run(
+  private static void runForClass(
       DexProgramClass clazz,
       AppView<?> appView,
       DebugRepresentationPredicate representation,
@@ -181,7 +180,7 @@
 
       for (ProgramMethod method : methods) {
         DexEncodedMethod definition = method.getDefinition();
-        if (methodName == method.getName()
+        if (method.getName().isIdenticalTo(methodName)
             && !mustHaveResidualDebugInfo(appView.options(), definition)
             && !definition.isD8R8Synthesized()
             && methods.size() <= 1) {