commit 56f6975a33c0b9df9bb211fe88deaedf2021b1fd
author Christoffer Adamsen <christofferqa@google.com> Tue Jun 10 11:08:09 2025 +0000
committer Christoffer Adamsen <christofferqa@google.com> Tue Jun 10 04:48:24 2025 -0700
tree 4e04a641c6008e8f35c8a35915a86d9610bef450
parent 33e28a5436d27c306e0515c3ebd71616050da7bb

Fix incorrect handling of library call in class inliner

Bug: b/423658598
Change-Id: I45b678e8d576647bb3c88bd3d1d9be7b9e9b7617

src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
index 5365575..b84e744 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/classinliner/InlineCandidateProcessor.java
@@ -538,16 +538,20 @@
             throw new IllegalClassInlinerStateException();
           }
 
-          ProgramMethod singleTarget =
-              dispatchTargetLookupResult
-                  .asSingleResult()
-                  .getSingleDispatchTarget()
-                  .asProgramMethod();
-          if (singleTarget == null || !indirectMethodCallsOnInstance.contains(singleTarget)) {
+          DexClassAndMethod singleTarget =
+              dispatchTargetLookupResult.asSingleResult().getSingleDispatchTarget();
+          if (singleTarget.isLibraryMethod()) {
+            // Library calls (e.g., calls to Object.getClass) are handled in removeMiscUsages.
+            continue;
+          }
+
+          ProgramMethod singleProgramTarget = singleTarget.asProgramMethod();
+          if (singleProgramTarget == null
+              || !indirectMethodCallsOnInstance.contains(singleProgramTarget)) {
             throw new IllegalClassInlinerStateException();
           }
 
-          methodCallsOnInstance.put(invoke, new InliningInfo(singleTarget, null));
+          methodCallsOnInstance.put(invoke, new InliningInfo(singleProgramTarget, null));
         }
       }
       currentUsers = indirectOutValueUsers;