commit daae897d8215d6709fc2ba366340b07b891745ab
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Apr 06 07:36:57 2020 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Apr 06 07:09:23 2020 +0000
tree 706a84d718672d9bfd4a879a38718619ebf339c3
parent aeb321b5820831a563e9413fd63e7639b7375289

Use other lookupVirtualDispatchTargets() when upper-bound-type is library

Change-Id: I5fabd9ca8b5ca5cb4adf909016381c0f3dae0dad

src/main/java/com/android/tools/r8/ir/code/InvokeMethod.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/InvokeMethod.java b/src/main/java/com/android/tools/r8/ir/code/InvokeMethod.java
index 9bf5391..f356690 100644
--- a/src/main/java/com/android/tools/r8/ir/code/InvokeMethod.java
+++ b/src/main/java/com/android/tools/r8/ir/code/InvokeMethod.java
@@ -12,7 +12,8 @@
 import com.android.tools.r8.graph.DexMethod;
 import com.android.tools.r8.graph.DexProgramClass;
 import com.android.tools.r8.graph.DexType;
-import com.android.tools.r8.graph.LookupResult.LookupResultSuccess;
+import com.android.tools.r8.graph.LookupResult;
+import com.android.tools.r8.graph.ResolutionResult;
 import com.android.tools.r8.ir.analysis.ClassInitializationAnalysis;
 import com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet;
 import com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling;
@@ -98,17 +99,22 @@
       refinedReceiverLowerBound =
           asProgramClassOrNull(appView.definitionFor(refinedReceiverLowerBoundType.getClassType()));
     }
-    LookupResultSuccess lookupResult =
-        appView
-            .appInfo()
-            .resolveMethod(method.holder, method)
-            .lookupVirtualDispatchTargets(
-                appView.definitionForProgramType(invocationContext),
-                appView.withLiveness().appInfo(),
-                refinedReceiverUpperBound,
-                refinedReceiverLowerBound)
-            .asLookupResultSuccess();
-    if (lookupResult == null) {
+    ResolutionResult resolutionResult = appView.appInfo().resolveMethod(method.holder, method);
+    LookupResult lookupResult;
+    if (refinedReceiverUpperBound != null) {
+      lookupResult =
+          resolutionResult.lookupVirtualDispatchTargets(
+              appView.definitionForProgramType(invocationContext),
+              appView.withLiveness().appInfo(),
+              refinedReceiverUpperBound,
+              refinedReceiverLowerBound);
+    } else {
+      lookupResult =
+          resolutionResult.lookupVirtualDispatchTargets(
+              appView.definitionForProgramType(invocationContext),
+              appView.withLiveness().appInfo());
+    }
+    if (lookupResult.isLookupResultFailure()) {
       return null;
     }
     Set<DexEncodedMethod> result = Sets.newIdentityHashSet();