commit 3742e906977686b227748b94f48fafb04dad2fdb
author Christoffer Adamsen <christofferqa@google.com> Fri Sep 12 12:31:39 2025 +0200
committer Christoffer Adamsen <christofferqa@google.com> Fri Sep 12 03:52:09 2025 -0700
tree ce288b81f98719d35e336361a19b3657c2343093
parent 49802541727ef0de030d4cbcf47d6d99b8f212e1

Fix redundant uses of toArrayType

Change-Id: I7f21ba98483eb011dc2c6d201cb879c7d5034a93

src/main/java/com/android/tools/r8/graph/LazyCfCode.java

diff --git a/src/main/java/com/android/tools/r8/graph/LazyCfCode.java b/src/main/java/com/android/tools/r8/graph/LazyCfCode.java
index e625d5a..739a874 100644
--- a/src/main/java/com/android/tools/r8/graph/LazyCfCode.java
+++ b/src/main/java/com/android/tools/r8/graph/LazyCfCode.java
@@ -815,7 +815,7 @@
           addInstruction(new CfConstNumber(operand, ValueType.INT));
           break;
         case Opcodes.NEWARRAY:
-          addInstruction(new CfNewArray(arrayTypeDesc(operand, factory).toArrayType(factory)));
+          addInstruction(new CfNewArray(arrayTypeDesc(operand, factory)));
           break;
         default:
           throw new Unreachable("Unexpected int opcode " + opcode);
@@ -825,21 +825,21 @@
     private static DexType arrayTypeDesc(int arrayTypeCode, DexItemFactory factory) {
       switch (arrayTypeCode) {
         case Opcodes.T_BOOLEAN:
-          return factory.booleanType;
+          return factory.booleanArrayType;
         case Opcodes.T_CHAR:
-          return factory.charType;
+          return factory.charArrayType;
         case Opcodes.T_FLOAT:
-          return factory.floatType;
+          return factory.floatArrayType;
         case Opcodes.T_DOUBLE:
-          return factory.doubleType;
+          return factory.doubleArrayType;
         case Opcodes.T_BYTE:
-          return factory.byteType;
+          return factory.byteArrayType;
         case Opcodes.T_SHORT:
-          return factory.shortType;
+          return factory.shortArrayType;
         case Opcodes.T_INT:
-          return factory.intType;
+          return factory.intArrayType;
         case Opcodes.T_LONG:
-          return factory.longType;
+          return factory.longArrayType;
         default:
           throw new Unreachable("Unexpected array-type code " + arrayTypeCode);
       }
@@ -886,27 +886,31 @@
 
     @Override
     public void visitTypeInsn(int opcode, String typeName) {
-      DexType type = factory.createType(Type.getObjectType(typeName).getDescriptor());
-      switch (opcode) {
-        case Opcodes.NEW:
-          // A label is only required if this uninitialized-new instance flows into a frame.
-          CfNew cfNew = new CfNew(type, currentLabel);
-          if (cfNew.hasLabel()) {
-            labelToNewMap.put(cfNew.getLabel(), cfNew);
-          }
-          addInstruction(cfNew);
-          break;
-        case Opcodes.ANEWARRAY:
-          addInstruction(new CfNewArray(type.toArrayType(factory)));
-          break;
-        case Opcodes.CHECKCAST:
-          addInstruction(new CfCheckCast(type));
-          break;
-        case Opcodes.INSTANCEOF:
-          addInstruction(new CfInstanceOf(type));
-          break;
-        default:
-          throw new Unreachable("Unexpected TypeInsn opcode: " + opcode);
+      String descriptor = Type.getObjectType(typeName).getDescriptor();
+      if (opcode == Opcodes.ANEWARRAY) {
+        String arrayDescriptor = DescriptorUtils.toArrayDescriptor(1, descriptor);
+        DexType arrayType = factory.createType(arrayDescriptor);
+        addInstruction(new CfNewArray(arrayType));
+      } else {
+        DexType type = factory.createType(descriptor);
+        switch (opcode) {
+          case Opcodes.NEW:
+            // A label is only required if this uninitialized-new instance flows into a frame.
+            CfNew cfNew = new CfNew(type, currentLabel);
+            if (cfNew.hasLabel()) {
+              labelToNewMap.put(cfNew.getLabel(), cfNew);
+            }
+            addInstruction(cfNew);
+            break;
+          case Opcodes.CHECKCAST:
+            addInstruction(new CfCheckCast(type));
+            break;
+          case Opcodes.INSTANCEOF:
+            addInstruction(new CfInstanceOf(type));
+            break;
+          default:
+            throw new Unreachable("Unexpected TypeInsn opcode: " + opcode);
+        }
       }
     }