commit 1c041f645101bb1f30b85fbb7cceb9d9803dee2c
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Feb 13 09:44:09 2023 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Feb 13 10:30:50 2023 +0000
tree 7b02a5bedd30ef3fb88eb1f5e72e5562a8468da3
parent 6ae4611db18f799a890c9de3a6e15cd6702ad90c

Account for non-found method on super-type

Bug: b/268218172
Change-Id: I890ce5a1b7a2b9358383f2e26d954894eea1133a

src/main/java/com/android/tools/r8/graph/MethodResolution.java

diff --git a/src/main/java/com/android/tools/r8/graph/MethodResolution.java b/src/main/java/com/android/tools/r8/graph/MethodResolution.java
index 11f9bd9..a56b0ef 100644
--- a/src/main/java/com/android/tools/r8/graph/MethodResolution.java
+++ b/src/main/java/com/android/tools/r8/graph/MethodResolution.java
@@ -205,9 +205,12 @@
                     && !superClass.isLibraryClass()) {
                   return;
                 }
-                builder.addResolutionResult(
+                MethodResolutionResult superTypeResult =
                     resolveMethodOnClassStep2(
-                        superClass, methodProto, methodName, initialResolutionHolder));
+                        superClass, methodProto, methodName, initialResolutionHolder);
+                if (superTypeResult != null) {
+                  builder.addResolutionResult(superTypeResult);
+                }
               });
       return builder.buildOrIfEmpty(null, clazz.superType);
     }