commit 039dc71428b4799b1faecb8d256b968de9987931
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Jul 14 17:41:27 2021 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Jul 14 17:41:27 2021 +0200
tree 88ba666a49dd41312a6e81cfede7c2dc7c1b38cf
parent 222f051d13cbeaa3883e27c1b016f38fd454b061

[ApiModel] Use computeMaxs for api database

Change-Id: Icb612d332f3aefbe9f471ffacffd9c91c267a259

src/test/java/com/android/tools/r8/apimodel/AndroidApiDatabaseBuilderGenerator.java

diff --git a/src/test/java/com/android/tools/r8/apimodel/AndroidApiDatabaseBuilderGenerator.java b/src/test/java/com/android/tools/r8/apimodel/AndroidApiDatabaseBuilderGenerator.java
index 17b6486..dfaecd1 100644
--- a/src/test/java/com/android/tools/r8/apimodel/AndroidApiDatabaseBuilderGenerator.java
+++ b/src/test/java/com/android/tools/r8/apimodel/AndroidApiDatabaseBuilderGenerator.java
@@ -36,6 +36,7 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
 
@@ -102,7 +103,8 @@
               .removeMethods(MethodPredicate.onName("placeHolderForGetMemberCount"))
               .removeMethods(MethodPredicate.onName("placeHolderForVisitFields"))
               .removeMethods(MethodPredicate.onName("placeHolderForVisitMethods"))
-              .transform());
+              .computeMaxs()
+              .transform(ClassWriter.COMPUTE_MAXS));
     }
 
     for (String pkg : packages) {
@@ -112,7 +114,8 @@
               .setClassDescriptor(getPackageBuilderDescriptor(pkg))
               .addMethodTransformer(getBuildClassTransformer(packageToClassesMap.get(pkg)))
               .removeMethods(MethodPredicate.onName("placeHolder"))
-              .transform());
+              .computeMaxs()
+              .transform(ClassWriter.COMPUTE_MAXS));
     }
 
     consumer.accept(
@@ -123,7 +126,8 @@
             .addMethodTransformer(getBuildPackageTransformer(packages))
             .removeMethods(MethodPredicate.onName("placeHolderForVisitApiClasses"))
             .removeMethods(MethodPredicate.onName("placeHolderForBuildClass"))
-            .transform());
+            .computeMaxs()
+            .transform(ClassWriter.COMPUTE_MAXS));
   }
 
   private static String getPackageBuilderDescriptor(String pkg) {