commit 0b579d0bee06cfb404c5f18c4827aee0d3a4e771
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Oct 10 11:52:01 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Oct 10 09:52:21 2019 +0000
tree 7d154aeffc5953c88fdea422b9b9572fff4d6ec3
parent 08fdea1fe10944c727566b5a41299f8a30eddef0

Handle SENTINEL return from findSingleTargetFromSubtypes

Change-Id: I36bfcfef1c46e7e33fcd65a6b7b773acda677667

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 e3cce51..45f5bed 100644
--- a/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
+++ b/src/main/java/com/android/tools/r8/shaking/AppInfoWithLiveness.java
@@ -884,7 +884,7 @@
       DexEncodedMethod singleTarget, DexEncodedMethod resolutionResult) {
     assert resolutionResult.isValidVirtualTarget(options());
 
-    if (singleTarget == null) {
+    if (singleTarget == null || singleTarget == DexEncodedMethod.SENTINEL) {
       return null;
     }
 
@@ -991,8 +991,7 @@
                 !refinedHolder.accessFlags.isAbstract(),
                 topIsFromInterface),
             topMethod.asSingleTarget());
-    // Map the failure case of SENTINEL to null.
-    result = result == DexEncodedMethod.SENTINEL ? null : result;
+    assert result != DexEncodedMethod.SENTINEL;
     method.setSingleVirtualMethodCache(refinedReceiverType, result);
     return result;
   }