commit e349b079c4bd69f860e32cb6d7f5aa5d6897ee92
author Clément Béra <clementbera@google.com> Mon Jun 17 12:59:07 2024 +0200
committer Clément Béra <clementbera@google.com> Tue Jun 18 10:32:54 2024 +0000
tree c77da2d6378e15d1ffa273b9f5ff945899d198b0
parent f4fd2c7b46427f76f168bb3affc40b6f9bf0363c

Remove deprected arg count

- The arg count is now directly held by the type

Bug: b/341991457
Change-Id: I733b911930e0d6ca5c076801832ba6dca9066fcc

src/main/java/com/android/tools/r8/kotlin/KotlinAnnotationArgumentInfo.java

diff --git a/src/main/java/com/android/tools/r8/kotlin/KotlinAnnotationArgumentInfo.java b/src/main/java/com/android/tools/r8/kotlin/KotlinAnnotationArgumentInfo.java
index 329dbbe..ffbbe57 100644
--- a/src/main/java/com/android/tools/r8/kotlin/KotlinAnnotationArgumentInfo.java
+++ b/src/main/java/com/android/tools/r8/kotlin/KotlinAnnotationArgumentInfo.java
@@ -59,18 +59,15 @@
   private static class KotlinAnnotationClassValueInfo extends KotlinAnnotationArgumentInfo {
 
     private final KotlinTypeReference value;
-    private final int arrayDimensionCount;
 
-    private KotlinAnnotationClassValueInfo(KotlinTypeReference value, int arrayDimensionCount) {
+    private KotlinAnnotationClassValueInfo(KotlinTypeReference value) {
       this.value = value;
-      this.arrayDimensionCount = arrayDimensionCount;
     }
 
     private static KotlinAnnotationClassValueInfo create(KClassValue arg, DexItemFactory factory) {
       return new KotlinAnnotationClassValueInfo(
           KotlinTypeReference.fromBinaryNameOrKotlinClassifier(
-              arg.getClassName(), factory, arg.getClassName()),
-          arg.getArrayDimensionCount());
+              arg.getClassName(), factory, arg.getClassName()));
     }
 
     @Override
@@ -81,7 +78,7 @@
     @Override
     boolean rewrite(Consumer<KmAnnotationArgument> consumer, AppView<?> appView) {
       return value.toRenamedBinaryNameOrDefault(
-          rewrittenValue -> consumer.accept(new KClassValue(rewrittenValue, arrayDimensionCount)),
+          rewrittenValue -> consumer.accept(new KClassValue(rewrittenValue)),
           appView,
           ClassClassifiers.anyName);
     }