Use class-file API instead of ASM

Author: ziyilin

substratevm/mx.substratevm/mx_substratevm.py

@@ -1823,11 +1823,10 @@ def build_and_run(args, binary_path, native_image, agents, agents_arg):
         mx.log('Run agent with JVM as baseline')
         test_cp = os.pathsep.join([classpath('com.oracle.svm.test')])
         java_run_cp = os.pathsep.join([test_cp, mx.dependency('org.graalvm.nativeimage').classpath_repr()])
-        mx.run_java( agents_arg +  ['--add-exports=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED',
-                     '-cp', java_run_cp, 'com.oracle.svm.test.javaagent.AgentTest'])
+        mx.run_java( agents_arg +  ['-cp', java_run_cp, 'com.oracle.svm.test.javaagent.AgentTest'])
         test_cp = os.pathsep.join([test_cp] + agents)
         native_agent_premain_options = ['-XXpremain:com.oracle.svm.test.javaagent.agent1.TestJavaAgent1:test.agent1=true', '-XXpremain:com.oracle.svm.test.javaagent.agent2.TestJavaAgent2:test.agent2=true']
-        image_args = ['-cp', test_cp, '-J-ea', '-J-esa', '-H:+ReportExceptionStackTraces', '-J--add-exports=java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED', '-H:Class=com.oracle.svm.test.javaagent.AgentTest']
+        image_args = ['-cp', test_cp, '-J-ea', '-J-esa', '-H:+ReportExceptionStackTraces', '-H:Class=com.oracle.svm.test.javaagent.AgentTest']
         native_image(image_args + svm_experimental_options(agents_arg) + ['-o', binary_path] + args)
         mx.run([binary_path] + native_agent_premain_options)
 

substratevm/mx.substratevm/suite.py

@@ -1076,7 +1076,6 @@
                 "java.base" : [
                     "jdk.internal.misc",
                     "sun.security.jca",
-                    "jdk.internal.org.objectweb.asm"
                 ],
             },
             "checkstyle": "com.oracle.svm.test",

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/javaagent/agent1/TestJavaAgent1.java

@@ -29,21 +29,19 @@
 import org.graalvm.nativeimage.ImageInfo;
 import org.junit.Assert;
 
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.ClassModel;
+import java.lang.classfile.MethodModel;
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.Instrumentation;
 import java.security.ProtectionDomain;
 import java.util.Collections;
 import java.util.Set;
-import jdk.internal.org.objectweb.asm.ClassReader;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.ClassVisitor;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
 
 public class TestJavaAgent1 {
 
     public static void premain(
-                    String agentArgs, Instrumentation inst) {
+            String agentArgs, Instrumentation inst) {
         AgentPremainHelper.parseOptions(agentArgs);
         System.setProperty("instrument.enable", "true");
         AgentPremainHelper.load(TestJavaAgent1.class);
@@ -146,40 +144,29 @@ static class DemoTransformer implements ClassFileTransformer {
 
         @Override
         public byte[] transform(
-                        ClassLoader loader,
-                        String className,
-                        Class<?> classBeingRedefined,
-                        ProtectionDomain protectionDomain,
-                        byte[] classfileBuffer) {
+                ClassLoader loader,
+                String className,
+                Class<?> classBeingRedefined,
+                ProtectionDomain protectionDomain,
+                byte[] classfileBuffer) {
             if (internalClassName.equals(className)) {
-                ClassReader cr = new ClassReader(classfileBuffer);
-                ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-
-                ClassVisitor cv = new ClassVisitor(Opcodes.ASM9, cw) {
-                    @Override
-                    public MethodVisitor visitMethod(int access, String name, String descriptor,
-                                    String signature, String[] exceptions) {
-                        MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
-                        if ("getCounter".equals(name) && "()I".equals(descriptor)) {
-                            return new MethodVisitor(api, mv) {
-                                @Override
-                                public void visitInsn(int opcode) {
-                                    if (opcode == Opcodes.IRETURN) {
-                                        super.visitLdcInsn(11);
-                                    }
-                                    super.visitInsn(opcode);
-                                }
-                            };
-                        }
-                        return mv;
+                ClassFile classFile = ClassFile.of();
+                ClassModel classModel = classFile.parse(classfileBuffer);
+
+                return classFile.transformClass(classModel, (classbuilder, ce) -> {
+                    if (ce instanceof MethodModel mm && mm.methodName().equalsString("getCounter")
+                            && mm.methodType().equalsString("()I")) {
+                        classbuilder.transformMethod(mm, (mb, me) -> {
+                            mb.withCode(cb -> {
+                                cb.loadConstant(11);
+                                cb.ireturn();
+                            });
+                        });
+                    } else {
+                        classbuilder.with(ce);
                     }
-                };
-
-                cr.accept(cv, 0);
-
-                return cw.toByteArray();
+                });
             }
-
             return null;
         }
     }