commit 8f78f31912b3d7edcbcfef1dd67dde16b13cd247
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Oct 02 11:36:54 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Oct 02 10:21:22 2019 +0000
tree 5b97ccf109c872556d524a54ac4921a896973de5
parent 3a134d5a8b5de65e79dacf2bf81f06a7f9ef9100

Fix array bug in vertical class merger

Bug: 141942381
Change-Id: I4b5f36283648539e45414065975349b5ccbe5bf7

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

diff --git a/src/main/java/com/android/tools/r8/shaking/VerticalClassMergerGraphLense.java b/src/main/java/com/android/tools/r8/shaking/VerticalClassMergerGraphLense.java
index 689eea1..a265d99 100644
--- a/src/main/java/com/android/tools/r8/shaking/VerticalClassMergerGraphLense.java
+++ b/src/main/java/com/android/tools/r8/shaking/VerticalClassMergerGraphLense.java
@@ -248,7 +248,7 @@
       DexType newHolder = mergedClasses.getOrDefault(holder, holder);
 
       DexType type = field.type;
-      DexType newType = mergedClasses.getOrDefault(type, type);
+      DexType newType = getTypeAfterClassMerging(type, mergedClasses);
 
       if (holder == newHolder && type == newType) {
         return field;