commit 34b689c383e75792cb58d9a8f33820782fb1f0e4
author Søren Gjesse <sgjesse@google.com> Fri Feb 23 13:13:15 2024 +0100
committer Søren Gjesse <sgjesse@google.com> Fri Feb 23 12:17:22 2024 +0000
tree 2d856154f8064491c886965fe88a8f870f58ee56
parent 11baf1ca48f617d415057e851a249bbe254419fa

Ensure single caller inliner only prunes methods which are inlined

Fixes: b/326389642
Change-Id: I1b5e2d412e19a0aaf352bba45e434fda2c8f1949

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 cf0719c..f71e82f 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
@@ -181,7 +181,10 @@
           ProgramMethodMap<Integer> counters = ProgramMethodMap.create();
           for (LirInstructionView view : code) {
             int opcode = view.getOpcode();
-            if (opcode != LirOpcodes.INVOKEDIRECT && opcode != LirOpcodes.INVOKEDIRECT_ITF) {
+            if (opcode != LirOpcodes.INVOKEDIRECT
+                && opcode != LirOpcodes.INVOKEDIRECT_ITF
+                // JDK 17 generates invokevirtual to private methods.
+                && opcode != LirOpcodes.INVOKEVIRTUAL) {
               continue;
             }
             DexMethod invokedMethod =
@@ -195,9 +198,9 @@
               counters.put(resolvedMethod, counters.getOrDefault(resolvedMethod, 0) + 1);
             }
           }
-          counters.forEach(
-              (callee, counter) -> {
-                if (counter > 1) {
+          callees.forEach(
+              (callee) -> {
+                if (!counters.containsKey(callee) || counters.get(callee) > 1) {
                   singleCallerMethodCandidates.remove(callee);
                 }
               });