commit 080c1f5fceedd30043dbeb740f393d713bfd8cfb
author Ian Zerny <zerny@google.com> Fri Oct 04 11:17:05 2019 +0200
committer Ian Zerny <zerny@google.com> Fri Oct 04 11:17:05 2019 +0200
tree a32c888cde1c3abd7cfccd8baf51078dcc6f3768
parent f6085f3532a1593cd06c07e927afa5969b951875

Fix incorrect resolved check.

Change-Id: I5560541674cae8087145fe2e7a8f8403f3dd368b

src/main/java/com/android/tools/r8/shaking/Enqueuer.java

diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index 08f3cc3..80aa238 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -1986,7 +1986,7 @@
         MarkedResolutionTarget possiblyValidTarget =
             markPossiblyValidTarget(
                 method, reason, resolutionTarget, resolutionTargetClass.asProgramClass());
-        if (possiblyValidTarget != null) {
+        if (!possiblyValidTarget.isUnresolved()) {
           // Since some Art runtimes may actually end up targeting this method, it is returned as
           // the basis of lookup for the enqueuing of virtual dispatches. Not doing so may cause it
           // to be marked abstract, thus leading to an AbstractMethodError on said Art runtimes.