commit 58a19e0cedf3966de41dbddcc8b87206e5e5c62c
author Christoffer Adamsen <christofferqa@google.com> Fri Feb 16 12:39:51 2024 +0000
committer Christoffer Adamsen <christofferqa@google.com> Fri Feb 16 12:39:51 2024 +0000
tree 0f2fa955d96be0c3c5ef86dc54f935e7c15f57a2
parent aa8b5de8b3cc5b54d97c86eae433f238a1dc916a

Fix error prone failure from ProgramMethod comparison

Change-Id: I1f18872810774a5e073f6a7f91ddb8c9ebad6f5c

src/main/java/com/android/tools/r8/optimize/singlecaller/SingleCallerScanner.java

diff --git a/src/main/java/com/android/tools/r8/optimize/singlecaller/SingleCallerScanner.java b/src/main/java/com/android/tools/r8/optimize/singlecaller/SingleCallerScanner.java
index c0d5b6a..cf0719c 100644
--- a/src/main/java/com/android/tools/r8/optimize/singlecaller/SingleCallerScanner.java
+++ b/src/main/java/com/android/tools/r8/optimize/singlecaller/SingleCallerScanner.java
@@ -19,6 +19,7 @@
 import com.android.tools.r8.lightir.LirInstructionView;
 import com.android.tools.r8.lightir.LirOpcodes;
 import com.android.tools.r8.shaking.AppInfoWithLiveness;
+import com.android.tools.r8.utils.ObjectUtils;
 import com.android.tools.r8.utils.ThreadUtils;
 import com.android.tools.r8.utils.collections.ProgramMethodMap;
 import com.android.tools.r8.utils.collections.ProgramMethodSet;
@@ -55,7 +56,7 @@
     traceResult.forEach(
         (callee, caller) -> {
           if (callee.getDefinition().hasCode()
-              && caller != MULTIPLE_CALLERS
+              && ObjectUtils.notIdentical(caller, MULTIPLE_CALLERS)
               && !callee.isStructurallyEqualTo(caller)) {
             singleCallerMethodCandidates.put(callee, caller);
           }
@@ -86,7 +87,7 @@
     }
     threadLocalSingleCallerMethods.forEach(
         (callee, caller) -> {
-          if (caller == MULTIPLE_CALLERS) {
+          if (ObjectUtils.identical(caller, MULTIPLE_CALLERS)) {
             singleCallerMethods.put(callee, MULTIPLE_CALLERS);
           } else {
             recordCallEdge(caller, callee, singleCallerMethods);