commit f35520f064c8226924233c02516fea94bd5e5aac
author Mads Ager <ager@google.com> Wed May 23 09:32:37 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 23 09:32:37 2018 +0000
tree 5ad177b62dd33e9055652412673f53f49c676bd8
parent a4042f56b8c9864e3d3645d429a02047051bba1f
parent e1fe5e531b59714a62032938094fee82f7bb4a4c

Merge "Only rewrite invoke-virtual to invoke-direct if the direct resolution result is on the target of the invoke and *not* a base class."

src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
index d2ba632..8c1af35 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
@@ -1063,7 +1063,8 @@
       // therefore we use an invoke-direct instead. We need to do this as the Android Runtime
       // will not allow invoke-virtual of a private method.
       DexMethod method = (DexMethod) item;
-      if (appInfo.lookupDirectTarget(method) != null) {
+      DexEncodedMethod directTarget = appInfo.lookupDirectTarget(method);
+      if (directTarget != null && method.holder == directTarget.method.holder) {
         type = Type.DIRECT;
       }
     }