commit aa8b5de8b3cc5b54d97c86eae433f238a1dc916a
author Christoffer Adamsen <christofferqa@google.com> Fri Feb 16 12:35:23 2024 +0000
committer Christoffer Adamsen <christofferqa@google.com> Fri Feb 16 12:37:04 2024 +0000
tree 64db51fbba0be5dee11e1d44b61d783cc17dbeb9
parent 30a12b0e9e931907a554fd029ef95d9e29a1efcf

Fix bad merge with LirCode update

Change-Id: I5b153a96b721fbce7575a4cb8d8d25e8412a9664

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

diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/IncompleteVirtuallyMergedMethodCode.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/IncompleteVirtuallyMergedMethodCode.java
index 75deda3..e39290c 100644
--- a/src/main/java/com/android/tools/r8/horizontalclassmerging/IncompleteVirtuallyMergedMethodCode.java
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/IncompleteVirtuallyMergedMethodCode.java
@@ -28,7 +28,6 @@
 import com.android.tools.r8.graph.lens.GraphLens;
 import com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.SuperMethodReference;
 import com.android.tools.r8.ir.analysis.type.TypeElement;
-import com.android.tools.r8.ir.code.IRMetadata;
 import com.android.tools.r8.ir.code.Value;
 import com.android.tools.r8.ir.code.ValueType;
 import com.android.tools.r8.lightir.LirBuilder;
@@ -176,11 +175,10 @@
         LirStrategy.getDefaultStrategy().getEncodingStrategy();
     LirBuilder<Value, Integer> lirBuilder =
         LirCode.builder(
-                method.getReference(),
-                method.getDefinition().isD8R8Synthesized(),
-                strategy,
-                appView.options())
-            .setMetadata(IRMetadata.unknown());
+            method.getReference(),
+            method.getDefinition().isD8R8Synthesized(),
+            strategy,
+            appView.options());
 
     int instructionIndex = 0;
     List<Value> argumentValues = new ArrayList<>();

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

diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/UndoConstructorInlining.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/UndoConstructorInlining.java
index f10c18b..47f55800 100644
--- a/src/main/java/com/android/tools/r8/horizontalclassmerging/UndoConstructorInlining.java
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/UndoConstructorInlining.java
@@ -22,7 +22,6 @@
 import com.android.tools.r8.graph.MethodAccessFlags;
 import com.android.tools.r8.graph.ProgramMethod;
 import com.android.tools.r8.ir.analysis.type.TypeElement;
-import com.android.tools.r8.ir.code.IRMetadata;
 import com.android.tools.r8.ir.code.Value;
 import com.android.tools.r8.lightir.ByteArrayWriter;
 import com.android.tools.r8.lightir.ByteUtils;
@@ -263,7 +262,6 @@
       return methodsToAppend.isEmpty()
           ? code
           : code.copyWithNewConstantsAndInstructions(
-              code.getMetadataForIR(),
               ArrayUtils.appendElements(code.getConstantPool(), methodsToAppend),
               byteWriter.toByteArray());
     }
@@ -466,8 +464,7 @@
       LirEncodingStrategy<Value, Integer> strategy =
           LirStrategy.getDefaultStrategy().getEncodingStrategy();
       LirBuilder<Value, Integer> lirBuilder =
-          LirCode.builder(methodReference, true, strategy, appView.options())
-              .setMetadata(IRMetadata.unknown());
+          LirCode.builder(methodReference, true, strategy, appView.options());
 
       int instructionIndex = 0;
       List<Value> argumentValues = new ArrayList<>();