commit 70cdae3441e0b278bccd259828eb05302ce4b325
author Christoffer Adamsen <christofferqa@google.com> Wed Apr 24 10:28:42 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Wed Apr 24 08:31:49 2024 +0000
tree a14c94e854546d7cbd29845bdf6c48e166dcfe38
parent 8464765e35553f7c6d424393d6004bae6317e90f

Also use monomorphic method states for interface methods

Change-Id: I983cb0222a8321766d456afb34f57474833b09f2

src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/VirtualRootMethodsAnalysisBase.java

diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/VirtualRootMethodsAnalysisBase.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/VirtualRootMethodsAnalysisBase.java
index 6130e36..3343089 100644
--- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/VirtualRootMethodsAnalysisBase.java
+++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/codescanner/VirtualRootMethodsAnalysisBase.java
@@ -226,15 +226,8 @@
             VirtualRootMethod singleDispatchTarget = virtualRootMethod.getSingleDispatchTarget();
             if (singleDispatchTarget != null) {
               virtualRootMethod.forEach(
-                  method -> {
-                    // Interface methods can have siblings and can therefore not be mapped to their
-                    // unique non-abstract implementation, unless the interface method does not have
-                    // any siblings.
-                    setRootMethod(method, virtualRootMethod, singleDispatchTarget);
-                  });
-              if (!singleDispatchTarget.getMethod().getHolder().isInterface()) {
-                monomorphicVirtualNonRootMethods.add(singleDispatchTarget.getMethod());
-              }
+                  method -> setRootMethod(method, virtualRootMethod, singleDispatchTarget));
+              monomorphicVirtualNonRootMethods.add(singleDispatchTarget.getMethod());
             } else {
               virtualRootMethod.forEach(
                   method -> setRootMethod(method, virtualRootMethod, virtualRootMethod));