commit 12fbf0a46266ade2e3e96c0b835bb95f18f9fbb2
author Christoffer Quist Adamsen <christofferqa@google.com> Sun Dec 10 19:59:01 2023 +0100
committer Christoffer Adamsen <christofferqa@google.com> Mon Dec 11 08:48:16 2023 +0000
tree 3439e1e0fb4e8c0369cd17c4e034ed6cd58be693
parent 4e2200a762f004e338b57fbfecdebe6d3157bea4

Fix inadequate rewriting of invoke-super after vertical class merging

Change-Id: I4e9a697bacc48e68454c61cdd472d4e1378f2a5a

src/main/java/com/android/tools/r8/verticalclassmerging/ClassMerger.java

diff --git a/src/main/java/com/android/tools/r8/verticalclassmerging/ClassMerger.java b/src/main/java/com/android/tools/r8/verticalclassmerging/ClassMerger.java
index 166b1b1..bf8a075 100644
--- a/src/main/java/com/android/tools/r8/verticalclassmerging/ClassMerger.java
+++ b/src/main/java/com/android/tools/r8/verticalclassmerging/ClassMerger.java
@@ -546,8 +546,7 @@
         DexMethod signatureInHolder = oldTargetReference.withHolder(holder, dexItemFactory);
         // Only rewrite the invoke-super call if it does not lead to a NoSuchMethodError.
         boolean resolutionSucceeds =
-            holder.lookupVirtualMethod(signatureInHolder) != null
-                || appView.appInfo().lookupSuperTarget(signatureInHolder, holder, appView) != null;
+            appView.appInfo().resolveMethodOnClass(holder, signatureInHolder).isSingleResolution();
         if (resolutionSucceeds) {
           deferredRenamings.mapVirtualMethodToDirectInType(
               signatureInHolder, oldTarget, target.type);