| commit | 2816cf54330ad5aa25e59264038b4f4d2bfb1b83 | [log] [tgz] |
|---|---|---|
| author | Christoffer Quist Adamsen <christofferqa@google.com> | Wed Oct 02 12:29:24 2019 +0200 |
| committer | Christoffer Quist Adamsen <christofferqa@google.com> | Wed Oct 02 12:29:24 2019 +0200 |
| tree | deb684e86cfe75b0fce1ee8b3c541e277ce336c6 | |
| parent | 23dfd1f442ac4c3939873adf1a1d7b6c8a5bab25 [diff] |
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
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() { }
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;