Implement better indy and LDC for DynamicConstant

Author: JonathanxD

Kores

@@ -18,7 +18,7 @@ buildscript {
 }
 
 group 'com.koresframework'
-version '4.2.1.bytecode'
+version '4.2.2.bytecode'
 
 apply from: project(":Kores").file("gradle/common.gradle")
 
@@ -59,7 +59,7 @@ dependencies {
     // with runtime dependency pointing to Kores published version
     //compile project(":Kores")
     compileOnly project(":Kores")
-    runtimeOnly "com.koresframework:kores:4.2.1.base"
+    runtimeOnly "com.koresframework:kores:4.2.2.base"
     implementation 'com.github.jonathanxd:bytecode-disassembler:2.4.1'
     implementation "org.ow2.asm:asm:9.2"
     implementation "org.ow2.asm:asm-analysis:9.2"

build.gradle

@@ -242,7 +242,7 @@ object ConcatProcessor : Processor<Concat> {
                     )
                 )
                 .bootstrapArgs(bootstrapArgs)
-                .dynamicMethod(
+                .dynamicDescriptor(
                     DynamicMethodSpec(
                         "makeConcatWithConstants",
                         TypeSpec(typeOf<String>(), types),

src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/ConcatProcessor.kt

@@ -50,11 +50,13 @@ object InvokeDynamicProcessor : Processor<InvokeDynamicBase> {
 
         val mvHelper = METHOD_VISITOR.require(data)
 
-        val dynamicMethod = part.dynamicMethod
+        val dynamicDescriptor = part.dynamicDescriptor
 
-        processorManager.process(ArgumentsHolder::class.java, part.dynamicMethod, data)
+        if (dynamicDescriptor is ArgumentsHolder) {
+            processorManager.process(ArgumentsHolder::class.java, dynamicDescriptor, data)
+        }
 
-        val specification = dynamicMethod
+        val specification = dynamicDescriptor
 
         if (part is InvokeDynamicBase.LambdaMethodRefBase) {
             if (part is InvokeDynamicBase.LambdaLocalCodeBase) {
@@ -70,7 +72,7 @@ object InvokeDynamicProcessor : Processor<InvokeDynamicBase> {
             mvHelper.methodVisitor
         )
 
-        if (!part.dynamicMethod.typeSpec.returnType.`is`(Void.TYPE) && IN_EXPRESSION.require(data) == 0) {
+        if (!part.type.`is`(Void.TYPE) && IN_EXPRESSION.require(data) == 0) {
             mvHelper.methodVisitor.visitInsn(Opcodes.POP)
         }
     }

src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/InvokeDynamicProcessor.kt

@@ -40,7 +40,7 @@ import org.objectweb.asm.Opcodes
 object LiteralProcessor : Processor<Literal> {
 
     override fun process(part: Literal, data: TypedData, processorManager: ProcessorManager<*>) {
-        LiteralUtil.visitLiteral(part, METHOD_VISITOR.require(data).methodVisitor)
+        LiteralUtil.visitLiteral(part, METHOD_VISITOR.require(data).methodVisitor, data)
 
         if (IN_EXPRESSION.require(data) == 0) {
             METHOD_VISITOR.require(data).methodVisitor.visitInsn(Opcodes.POP)

src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/LiteralProcessor.kt

@@ -35,14 +35,14 @@ import com.koresframework.kores.bytecode.processor.*
 import com.koresframework.kores.bytecode.util.ReflectType
 import com.koresframework.kores.bytecode.util.allInnerTypes
 import com.koresframework.kores.bytecode.util.allTypes
-import com.koresframework.kores.common.getNewName
-import com.koresframework.kores.common.getNewNameBasedOnNameList
 import com.koresframework.kores.factory.*
 import com.koresframework.kores.type.*
 import com.koresframework.kores.util.conversion.access
 import com.github.jonathanxd.iutils.data.TypedData
 import com.github.jonathanxd.iutils.kt.add
 import com.github.jonathanxd.iutils.kt.require
+import com.koresframework.kores.common.*
+import com.koresframework.kores.util.typeDesc
 import java.lang.reflect.Type
 
 object Util {
@@ -51,6 +51,13 @@ object Util {
         spec.copy(returnType = resolveType(spec.returnType, data),
             parameterTypes = spec.parameterTypes.map { resolveType(it, data) })
 
+    fun resolveTypeDesc(desc: DynamicDescriptor, data: TypedData): String =
+        when (desc) {
+            is DynamicMethodSpec -> resolveType(desc.typeSpec, data).typeDesc
+            is DynamicTypeSpec -> resolveType(desc.type, data).typeDesc
+        }
+
+
     fun resolveType(koresType: ReflectType, data: TypedData): KoresType {
 
         val type by lazy {

src/main/kotlin/com/koresframework/kores/bytecode/processor/processors/Util.kt

@@ -27,6 +27,7 @@
  */
 package com.koresframework.kores.bytecode.util
 
+import com.github.jonathanxd.iutils.data.TypedData
 import com.koresframework.kores.Types
 import com.koresframework.kores.common.Stack
 import com.koresframework.kores.literal.Literal
@@ -40,7 +41,7 @@ import org.objectweb.asm.Type
 
 object LiteralUtil {
 
-    fun visitLiteral(num: Literal, mv: MethodVisitor) {
+    fun visitLiteral(num: Literal, mv: MethodVisitor, data: TypedData) {
         val value = num.value
 
         if (num == Stack)
@@ -58,6 +59,12 @@ object LiteralUtil {
 
             mv.visitInsn(Opcodes.ICONST_0)
 
+        } else if (num is Literals.DynamicConstantLiteral) {
+            val constantDynamic = MethodInvocationUtil.run {
+                num.spec.toConstantDynamic(data)
+            }
+
+            mv.visitLdcInsn(constantDynamic)
         } else if (num.type.`is`(Types.STRING)) {
 
             mv.visitLdcInsn((value as String).substring(1, value.length - 1))
@@ -92,7 +99,7 @@ object LiteralUtil {
 
             if (type.isPrimitive) {
                 val wrapperType = type.wrapperType
-                        ?: throw IllegalArgumentException("Primitive type '$type' has no wrapper version.")
+                    ?: throw IllegalArgumentException("Primitive type '$type' has no wrapper version.")
 
                 val wrapperTypeSpec = wrapperType.internalName
                 val classType = Types.CLASS.typeDesc

src/main/kotlin/com/koresframework/kores/bytecode/util/LiteralUtil.kt

@@ -29,7 +29,6 @@ package com.koresframework.kores.bytecode.util
 
 import com.koresframework.kores.base.*
 import com.koresframework.kores.bytecode.processor.processors.Util
-import com.koresframework.kores.type.KoresType
 import com.koresframework.kores.type.internalName
 import com.koresframework.kores.type.javaSpecName
 import com.koresframework.kores.util.TypeResolver
@@ -38,6 +37,7 @@ import com.koresframework.kores.util.toTypeSpec
 import com.koresframework.kores.util.typeDesc
 import com.github.jonathanxd.iutils.data.TypedData
 import com.github.jonathanxd.iutils.description.DescriptionUtil
+import com.koresframework.kores.bytecode.util.MethodInvocationUtil.toHandle
 import com.koresframework.kores.common.*
 import com.koresframework.kores.type.isInterface
 import org.objectweb.asm.*
@@ -98,15 +98,15 @@ object MethodInvocationUtil {
 
     fun visitBootstrapInvocation(
         bootstrap: InvokeDynamicBase,
-        spec: DynamicMethodSpec,
+        spec: DynamicDescriptor,
         data: TypedData,
         mv: MethodVisitor
     ) {
         val handle = MethodInvocationUtil.toHandle(bootstrap, data)
 
         mv.visitInvokeDynamicInsn(
             spec.name,
-            Util.resolveType(spec.typeSpec, data).typeDesc,
+            Util.resolveTypeDesc(spec, data),
             handle,
             *MethodInvocationUtil.toAsmArguments(bootstrap, data)
         )
@@ -156,12 +156,7 @@ object MethodInvocationUtil {
                     arg.toHandle(data)
                 }
                 is DynamicConstantSpec -> {
-                    ConstantDynamic(
-                        arg.constantName,
-                        Util.resolveType(arg.type, data).typeDesc,
-                        arg.bootstrapMethod.toHandle(data),
-                        *toAsmArguments(arg.bootstrapArgs, data)
-                    )
+                    arg.toConstantDynamic(data)
                 }
                 is TypeSpec -> {
 
@@ -181,6 +176,14 @@ object MethodInvocationUtil {
         return asmArgs
     }
 
+    fun DynamicConstantSpec.toConstantDynamic(data: TypedData): ConstantDynamic =
+        ConstantDynamic(
+            this.constantName,
+            Util.resolveType(this.type, data).typeDesc,
+            this.bootstrapMethod.toHandle(data),
+            *toAsmArguments(this.bootstrapArgs, data)
+        )
+
     fun MethodInvokeHandleSpec.toHandle(data: TypedData): Handle =
         Handle(
             InvokeTypeUtil.toAsm_H(this.invokeType),
@@ -238,7 +241,7 @@ object MethodInvocationUtil {
 
         return InvokeDynamic(
             bootstrap = methodInvokeSpec,
-            dynamicMethod = dynamicMethod,
+            dynamicDescriptor = dynamicMethod,
             bootstrapArgs = MethodInvocationUtil.bsmArgsFromAsm(args, typeResolver)
         )
     }

src/main/kotlin/com/koresframework/kores/bytecode/util/MethodInvocationUtil.kt

@@ -226,6 +226,8 @@ public static MethodDeclaration makeCM2(TypeRef typeDeclaration) {
                 Collections.singletonList("value")
         );
 
+        methodSource.add(VariableFactory.variable(Types.STRING, "a", Literals.DYNAMIC_CONSTANT(someConst)));
+
         InvokeDynamic bootstrapInvocation = DynamicInvocationFactory.invokeDynamic(
                 new MethodInvokeSpec(InvokeType.INVOKE_STATIC, BOOTSTRAP_SPEC),
                 new DynamicMethodSpec("helloWorld", Factories.typeSpec(Types.STRING, Types.STRING),

src/test/java/com/koresframework/kores/test/asm/IndyTest.java

@@ -1,4 +1,4 @@
-md5: 37e5ffe09ed6cae08690bbba4a449943
+md5: 9bf625c763e5cbee0e733ae2b5527e09
 
 version: Java 16 (60)
 access: ACC_PUBLIC (33)
@@ -39,14 +39,19 @@ public class fullName.IndyTest_Generated extends java.lang.Object {
     !parameter[name: x, access:  (0)]
     public java.lang.String check(int) {
       desc: (I)Ljava/lang/String; 
-      maxStack: 2, maxLocals: 2 
+      maxStack: 2, maxLocals: 3 
       Label_0:
        LINE 1 -> Label_0
         getstatic java.lang.System.out (type: java.io.PrintStream)
         ldc "Invoke Dynamic Bootstrap ->"              // type: java.lang.String
         invokevirtual java.io.PrintStream.println(java.lang.Object)void (ownerIsInterface: false)
       Label_1:
        LINE 2 -> Label_1
+        ldc some : Ljava/lang/String; com/koresframework/kores/test/asm/IndyTest.constantBootstrap(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/String; (6) [value]              // type: org.objectweb.asm.ConstantDynamic
+      Label_2:
+        astore 2
+      Label_3:
+       LINE 3 -> Label_3
         ldc "World"              // type: java.lang.String
         invokedynamic helloWorld(java.lang.String)java.lang.String [
           // Bootstrap method
@@ -56,8 +61,8 @@ public class fullName.IndyTest_Generated extends java.lang.Object {
           ]
         ]
         pop
-      Label_2:
-       LINE 3 -> Label_2
+      Label_4:
+       LINE 4 -> Label_4
         ldc "World"              // type: java.lang.String
         invokedynamic helloWorld(java.lang.String)java.lang.String [
           // Bootstrap method
@@ -67,10 +72,11 @@ public class fullName.IndyTest_Generated extends java.lang.Object {
           ]
         ]
         areturn
-      Label_3:
+      Label_5:
       LocalVariables {
-        index: 1, name: x, start: Label_0, end: Label_3, type: int, signature: null
-        index: 0, name: this, start: Label_0, end: Label_3, type: fullName.IndyTest_Generated, signature: null
+        index: 2, name: a, start: Label_2, end: Label_5, type: java.lang.String, signature: null
+        index: 1, name: x, start: Label_0, end: Label_5, type: int, signature: null
+        index: 0, name: this, start: Label_0, end: Label_5, type: fullName.IndyTest_Generated, signature: null
       }
     }