8294960: Convert java.base/java.lang.invoke package to use the Classfile API to generate lambdas and method handlers

src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java

@@ -25,8 +25,9 @@
 
 package java.lang.invoke;
 
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.Opcodes;
+import java.lang.constant.ClassDesc;
+import jdk.internal.classfile.attribute.SourceFileAttribute;
+import jdk.internal.misc.CDS;
 import sun.invoke.util.Wrapper;
 
 import java.util.ArrayList;
@@ -42,6 +43,10 @@
 import static java.lang.invoke.MethodHandleStatics.CLASSFILE_VERSION;
 import static java.lang.invoke.MethodTypeForm.*;
 import static java.lang.invoke.LambdaForm.Kind.*;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import jdk.internal.classfile.ClassBuilder;
+import jdk.internal.classfile.Classfile;
 
 /**
  * Helper class to assist the GenerateJLIClassesPlugin to get access to
@@ -329,7 +334,6 @@ static Map<String, byte[]> generateHolderClasses(Stream<String> traces)  {
                             break; // ignore
                     }
                 });
-
         return builder.build();
     }
 
@@ -504,19 +508,17 @@ static byte[] generateInvokersHolderClassBytes(String className,
      * a class with a specified name.
      */
     private static byte[] generateCodeBytesForLFs(String className, String[] names, LambdaForm[] forms) {
-        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS + ClassWriter.COMPUTE_FRAMES);
-        cw.visit(CLASSFILE_VERSION, Opcodes.ACC_PRIVATE + Opcodes.ACC_FINAL + Opcodes.ACC_SUPER,
-                className, null, InvokerBytecodeGenerator.INVOKER_SUPER_NAME, null);
-        cw.visitSource(className.substring(className.lastIndexOf('/') + 1), null);
-
-        for (int i = 0; i < forms.length; i++) {
-            InvokerBytecodeGenerator g
-                = new InvokerBytecodeGenerator(className, names[i], forms[i], forms[i].methodType());
-            g.setClassWriter(cw);
-            g.addMethod();
-        }
-
-        return cw.toByteArray();
+        return Classfile.of().build(ClassDesc.ofInternalName(className), clb -> {
+            clb.withFlags(Classfile.ACC_PRIVATE + Classfile.ACC_FINAL + Classfile.ACC_SUPER);
+            clb.withSuperclass(InvokerBytecodeGenerator.INVOKER_SUPER_DESC);
+            clb.withVersion(CLASSFILE_VERSION, 0);
+            clb.with(SourceFileAttribute.of(clb.constantPool().utf8Entry(className.substring(className.lastIndexOf('/') + 1))));
+            for (int i = 0; i < forms.length; i++) {
+                InvokerBytecodeGenerator g
+                        = new InvokerBytecodeGenerator(className, names[i], forms[i], forms[i].methodType());
+                g.addMethod(clb);
+            }
+        });
     }
 
     private static LambdaForm makeReinvokerFor(MethodType type) {