Version 1.6.35

Cherry pick: Fix array bug in vertical class merger
CL: https://r8-review.googlesource.com/c/r8/+/43883

Bug: 141942381
Change-Id: I4b5f36283648539e45414065975349b5ccbe5bf7

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 203966b..455fad2 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "1.6.34";
+  public static final String LABEL = "1.6.35";
 
   private Version() {
   }

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;