commit be5972bb59ea96ad45ba64657d5629fcb836fd45
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Jan 12 13:22:45 2022 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Jan 12 13:22:45 2022 +0100
tree 8e99d6990c036d9236bb1e57b44de5ae71811e7d
parent 77130a8ed9399ad2c828cc3b168308d8ed3e5df7

Use common supertype when merging instance fields in class merger

Change-Id: I3885990d8690f607e715d88558f5ffd17467efa0

src/main/java/com/android/tools/r8/horizontalclassmerging/ClassInstanceFieldsMerger.java

diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassInstanceFieldsMerger.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassInstanceFieldsMerger.java
index a8b8d30..682da64 100644
--- a/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassInstanceFieldsMerger.java
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassInstanceFieldsMerger.java
@@ -8,6 +8,8 @@
 import com.android.tools.r8.graph.AppView;
 import com.android.tools.r8.graph.DexEncodedField;
 import com.android.tools.r8.graph.DexProgramClass;
+import com.android.tools.r8.graph.DexType;
+import com.android.tools.r8.graph.DexTypeUtils;
 import com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens.Builder;
 import com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields.InstanceFieldInfo;
 import com.android.tools.r8.utils.IterableUtils;
@@ -149,12 +151,15 @@
 
     DexEncodedField newField;
     if (needsRelaxedType(targetField, sourceFields)) {
+      DexType newFieldType =
+          DexTypeUtils.computeLeastUpperBound(
+              appView,
+              Iterables.transform(
+                  Iterables.concat(IterableUtils.singleton(targetField), sourceFields),
+                  DexEncodedField::getType));
       newField =
           targetField.toTypeSubstitutedField(
-              appView,
-              targetField
-                  .getReference()
-                  .withType(appView.dexItemFactory().objectType, appView.dexItemFactory()));
+              appView, targetField.getReference().withType(newFieldType, appView.dexItemFactory()));
     } else {
       newField = targetField;
     }