try to fix: JSR/RET are not supported with computeFrames option

xfeep · xfeep · commit cdcdd585cce0 · 2023-03-24T21:56:04.000+08:00
diff --git a/src/java/nginx/clojure/wave/RemoveMonitorVisitor.java b/src/java/nginx/clojure/wave/RemoveMonitorVisitor.java
@@ -7,6 +7,7 @@
 import nginx.clojure.asm.ClassVisitor;
 import nginx.clojure.asm.MethodVisitor;
 import nginx.clojure.asm.Opcodes;
+import nginx.clojure.asm.commons.JSRInlinerAdapter;
 
 /**
  * @author Zhang,Yuexiang (xfeep)
@@ -30,7 +31,9 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str
 		if ((access & Opcodes.ACC_SYNCHRONIZED) == Opcodes.ACC_SYNCHRONIZED) {
 			access &= ~Opcodes.ACC_SYNCHRONIZED;
 		}
-		return new RemoveMonitorMethodVisitor(Opcodes.ASM9, super.visitMethod(access, name, descriptor, signature, exceptions));
+		RemoveMonitorMethodVisitor rm = new RemoveMonitorMethodVisitor(Opcodes.ASM9, super.visitMethod(access, name, descriptor, signature, exceptions));
+		JSRInlinerAdapter jia = new JSRInlinerAdapter(rm, access, name, descriptor, signature, exceptions);
+		return jia;
 	}
 	
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import nginx.clojure.asm.ClassVisitor;`
`8`	`8`	`import nginx.clojure.asm.MethodVisitor;`
`9`	`9`	`import nginx.clojure.asm.Opcodes;`
	`10`	`+import nginx.clojure.asm.commons.JSRInlinerAdapter;`
`10`	`11`
`11`	`12`	`/**`
`12`	`13`	`* @author Zhang,Yuexiang (xfeep)`
`@@ -30,7 +31,9 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str`
`30`	`31`	`if ((access & Opcodes.ACC_SYNCHRONIZED) == Opcodes.ACC_SYNCHRONIZED) {`
`31`	`32`	`access &= ~Opcodes.ACC_SYNCHRONIZED;`
`32`	`33`	`}`
`33`		`- return new RemoveMonitorMethodVisitor(Opcodes.ASM9, super.visitMethod(access, name, descriptor, signature, exceptions));`
	`34`	`+ RemoveMonitorMethodVisitor rm = new RemoveMonitorMethodVisitor(Opcodes.ASM9, super.visitMethod(access, name, descriptor, signature, exceptions));`
	`35`	`+ JSRInlinerAdapter jia = new JSRInlinerAdapter(rm, access, name, descriptor, signature, exceptions);`
	`36`	`+ return jia;`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`}`