commit 7f96dbc8e2d1b465011ed4f1892b0961df35772e
author Søren Gjesse <sgjesse@google.com> Tue Jun 26 14:32:41 2018 +0200
committer Søren Gjesse <sgjesse@google.com> Tue Jun 26 14:32:41 2018 +0200
tree 9cf71ffcdec9b2caec1a5c91cae68d4fa2ec8ca7
parent 13eac38b8c0fe0568c224c1634bc8a656024d72c

Use GraphLense invoke type in call graph calculation

Change-Id: I744361fe4c80f801c4d7614fe9b874ae6e8d4251

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

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java b/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java
index 85506ad..650757e 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java
@@ -12,6 +12,7 @@
 import com.android.tools.r8.graph.DexProgramClass;
 import com.android.tools.r8.graph.DexType;
 import com.android.tools.r8.graph.GraphLense;
+import com.android.tools.r8.graph.GraphLense.GraphLenseLookupResult;
 import com.android.tools.r8.graph.UseRegistry;
 import com.android.tools.r8.ir.code.Invoke.Type;
 import com.android.tools.r8.shaking.Enqueuer.AppInfoWithLiveness;
@@ -363,7 +364,9 @@
 
     private void processInvoke(Type type, DexMethod method) {
       DexEncodedMethod source = caller.method;
-      method = graphLense.lookupMethod(method, source, type).getMethod();
+      GraphLenseLookupResult result = graphLense.lookupMethod(method, source, type);
+      method = result.getMethod();
+      type = result.getType();
       DexEncodedMethod definition = appInfo.lookup(type, method, source.method.holder);
       if (definition != null) {
         assert !source.accessFlags.isBridge() || definition != caller.method;