Bug with invokedynamic bsm handle fixed

Author: DaniilStepanov

jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/MethodNodeBuilder.kt

@@ -23,6 +23,7 @@ import org.jacodb.api.cfg.*
 import org.jacodb.impl.cfg.util.*
 import org.objectweb.asm.Handle
 import org.objectweb.asm.Opcodes
+import org.objectweb.asm.Opcodes.H_GETSTATIC
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.*
 
@@ -562,7 +563,11 @@ class MethodNodeBuilder(
             tag,
             declaringClass.jvmClassName,
             name,
-            "(${argTypes.joinToString("") { it.jvmTypeName }})${returnType.jvmTypeName}",
+            if (argTypes.isEmpty() && tag <= H_GETSTATIC) {
+               returnType.jvmTypeName
+            } else {
+                "(${argTypes.joinToString("") { it.jvmTypeName }})${returnType.jvmTypeName}"
+            },
             isInterface
         )
     private val JcRawMethodConstant.asAsmType: Type

jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/RawInstListBuilder.kt

@@ -1110,8 +1110,16 @@ class RawInstListBuilder(
             tag,
             owner.typeName(),
             name,
-            Type.getArgumentTypes(desc).map { it.descriptor.typeName() },
-            Type.getReturnType(desc).descriptor.typeName(),
+            if (desc.contains("(")) {
+                Type.getArgumentTypes(desc).map { it.descriptor.typeName() }
+            } else {
+                listOf()
+            },
+            if (desc.contains("(")) {
+                Type.getReturnType(desc).descriptor.typeName()
+            } else {
+                Type.getReturnType("(;)$desc").descriptor.typeName()
+            },
             isInterface
         )
 
@@ -1125,7 +1133,6 @@ class RawInstListBuilder(
 
     private fun buildInvokeDynamicInsn(insnNode: InvokeDynamicInsnNode) {
         val desc = insnNode.desc
-        val bsmMethod = insnNode.bsm.bsmHandleArg
         val bsmArgs = insnNode.bsmArgs.map {
             when (it) {
                 is Number -> bsmNumberArg(it)
@@ -1136,6 +1143,7 @@ class RawInstListBuilder(
             }
         }.reversed()
         val args = Type.getArgumentTypes(desc).map { pop() }.reversed()
+        val bsmMethod = insnNode.bsm.bsmHandleArg
         val expr = JcRawDynamicCallExpr(
             bsmMethod,
             bsmArgs,