commit c13f0ebc3e15b039ddffa50b231c855e5d919a1c
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Mar 09 09:56:33 2020 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Mar 09 09:56:33 2020 +0100
tree dee51e2f24272c2fab97d3a5f5d8089f6274bf29
parent c14363381e4561a7b0489db5a17d008fc219943b

Fix missing null check in lookupSingleVirtualTarget()

Change-Id: Ia94085cb12c74cb2696d76acec8e47fe684b0b4c
Bug: 151036954

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

diff --git a/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java b/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
index 087f88c..87e317e 100644
--- a/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
+++ b/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
@@ -1232,7 +1232,7 @@
 
     LookupTarget singleTarget = lookupResult.getSingleLookupTarget();
     DexEncodedMethod singleMethodTarget = null;
-    if (singleTarget.isMethodTarget()) {
+    if (singleTarget != null && singleTarget.isMethodTarget()) {
       singleMethodTarget = singleTarget.asMethodTarget().getMethod();
     }
     method.setSingleVirtualMethodCache(refinedReceiverType, singleMethodTarget);