commit 66eaefb851184c0e90b877b0f68e0f3bc872b4da
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 05 14:25:39 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Jan 05 14:25:39 2021 +0100
tree 831b0f0c4ad12cc3bbf3362afddce026d592725f
parent 6f73f02d023340601fcaed235da55b384a2c76ba

Update test using JarClassFileReader

Change-Id: Ifb8168b5505d0d3e9dd99efaa077af77013d5baa

src/test/java/com/android/tools/r8/cfmethodgeneration/MethodGenerationBase.java

diff --git a/src/test/java/com/android/tools/r8/cfmethodgeneration/MethodGenerationBase.java b/src/test/java/com/android/tools/r8/cfmethodgeneration/MethodGenerationBase.java
index 689e080..4161d87 100644
--- a/src/test/java/com/android/tools/r8/cfmethodgeneration/MethodGenerationBase.java
+++ b/src/test/java/com/android/tools/r8/cfmethodgeneration/MethodGenerationBase.java
@@ -11,6 +11,7 @@
 import com.android.tools.r8.graph.ClassKind;
 import com.android.tools.r8.graph.DexEncodedMethod;
 import com.android.tools.r8.graph.DexItemFactory;
+import com.android.tools.r8.graph.DexProgramClass;
 import com.android.tools.r8.graph.DexType;
 import com.android.tools.r8.graph.JarApplicationReader;
 import com.android.tools.r8.graph.JarClassFileReader;
@@ -95,8 +96,8 @@
   private void readMethodTemplatesInto(CfCodePrinter codePrinter) throws IOException {
     InternalOptions options = new InternalOptions();
     options.testing.readInputStackMaps = true;
-    JarClassFileReader reader =
-        new JarClassFileReader(
+    JarClassFileReader<DexProgramClass> reader =
+        new JarClassFileReader<>(
             new JarApplicationReader(options),
             clazz -> {
               for (DexEncodedMethod method : clazz.allMethodsSorted()) {
@@ -107,9 +108,10 @@
                     method.getHolderType().getName() + "_" + method.method.name.toString();
                 codePrinter.visitMethod(methodName, method.getCode().asCfCode());
               }
-            });
+            },
+            ClassKind.PROGRAM);
     for (Class<?> clazz : getMethodTemplateClasses()) {
-      reader.read(Origin.unknown(), ClassKind.PROGRAM, ToolHelper.getClassAsBytes(clazz));
+      reader.read(Origin.unknown(), ToolHelper.getClassAsBytes(clazz));
     }
   }