Fix array bug in vertical class merger Bug: 141942381 Change-Id: I4b5f36283648539e45414065975349b5ccbe5bf7
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;