commit b030cac082b12be64370ca7c37d9442feb5f5d78
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Jun 13 14:29:50 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 13 14:29:50 2018 +0000
tree 61e8f5fcdf9e23ecc69b0f6dba8fe14575cb0b33
parent 11ed32f53554412967f011c442ee290cd81b8658
parent 68a477592c6c33a5ff442b41eae2dcb6fce70384

Merge "Update holder of fields during class merging"

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

diff --git a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
index e46f94e..d54c95c 100644
--- a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
+++ b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
@@ -582,10 +582,11 @@
 
     private DexEncodedField renameField(DexEncodedField existing, DexEncodedField field) {
       DexString oldName = field.field.name;
-      DexType holder = field.field.clazz;
-      DexEncodedField result =
-          field.toRenamedField(
-              getFreshName(oldName.toSourceString(), holder), application.dexItemFactory);
+      DexType oldHolder = field.field.clazz;
+      DexString newName = getFreshName(oldName.toSourceString(), oldHolder);
+      DexField newSignature =
+          application.dexItemFactory.createField(target.type, field.field.type, newName);
+      DexEncodedField result = field.toTypeSubstitutedField(newSignature);
       deferredRenamings.map(field.field, result.field);
       return result;
     }