commit 61a3dae79f10cb4d5f10da45c49a6b1659de663c
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Sep 17 14:20:49 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Sep 17 14:20:49 2020 +0200
tree 86f751c90c8be6f38c6dadaed0b3d0fa55ee6b5a
parent c7b5e2d53cb266eb01e152b6ead2b64afabb5f54

Account for methods on array types during rebinding

Change-Id: I58873cb3b06524f9c359b44a53827f5e5afbc136

src/main/java/com/android/tools/r8/optimize/MemberRebindingIdentityLensFactory.java

diff --git a/src/main/java/com/android/tools/r8/optimize/MemberRebindingIdentityLensFactory.java b/src/main/java/com/android/tools/r8/optimize/MemberRebindingIdentityLensFactory.java
index 7c6fda7..944af37 100644
--- a/src/main/java/com/android/tools/r8/optimize/MemberRebindingIdentityLensFactory.java
+++ b/src/main/java/com/android/tools/r8/optimize/MemberRebindingIdentityLensFactory.java
@@ -204,6 +204,9 @@
       if (!seenMethodReferences.add(method)) {
         return;
       }
+      if (method.getHolderType().isArrayType()) {
+        return;
+      }
       DexClass holder = appInfo.definitionFor(method.getHolderType(), context);
       if (holder == null) {
         return;