Fixed Class literal bug (hotfix-5)

Author: JonathanxD

src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/util/LiteralUtil.kt

@@ -94,7 +94,8 @@ object LiteralUtil {
 
                 mv.visitFieldInsn(Opcodes.GETSTATIC, wrapperTypeSpec, "TYPE", classType)
             } else {
-                mv.visitLdcInsn(type)
+                val asmType = Type.getType(type.javaSpecName)
+                mv.visitLdcInsn(asmType)
             }
         } else {
             throw IllegalArgumentException("Cannot handle literal: $num")

src/test/java/com/github/jonathanxd/codeapi/test/asm/LiteralBugTest.java

@@ -0,0 +1,78 @@
+/*
+ *      CodeAPI-BytecodeWriter - Framework to generate Java code and Bytecode code. <https://github.com/JonathanxD/CodeAPI-BytecodeWriter>
+ *
+ *         The MIT License (MIT)
+ *
+ *      Copyright (c) 2017 TheRealBuggy/JonathanxD (https://github.com/JonathanxD/ & https://github.com/TheRealBuggy/) <[email protected]>
+ *      Copyright (c) contributors
+ *
+ *
+ *      Permission is hereby granted, free of charge, to any person obtaining a copy
+ *      of this software and associated documentation files (the "Software"), to deal
+ *      in the Software without restriction, including without limitation the rights
+ *      to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *      copies of the Software, and to permit persons to whom the Software is
+ *      furnished to do so, subject to the following conditions:
+ *
+ *      The above copyright notice and this permission notice shall be included in
+ *      all copies or substantial portions of the Software.
+ *
+ *      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *      AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *      LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *      OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *      THE SOFTWARE.
+ */
+package com.github.jonathanxd.codeapi.test.asm;
+
+import com.github.jonathanxd.codeapi.CodeSource;
+import com.github.jonathanxd.codeapi.base.TypeDeclaration;
+import com.github.jonathanxd.codeapi.bytecode.BytecodeClass;
+import com.github.jonathanxd.codeapi.bytecode.classloader.CodeClassLoader;
+import com.github.jonathanxd.codeapi.bytecode.gen.BytecodeGenerator;
+import com.github.jonathanxd.codeapi.common.CodeParameter;
+import com.github.jonathanxd.codeapi.helper.Predefined;
+import com.github.jonathanxd.codeapi.literal.Literals;
+
+import org.junit.Test;
+
+import java.util.EnumSet;
+
+import static com.github.jonathanxd.codeapi.CodeAPI.sourceOfParts;
+import static com.github.jonathanxd.codeapi.Types.VOID;
+import static com.github.jonathanxd.codeapi.common.CodeModifier.PUBLIC;
+import static com.github.jonathanxd.codeapi.factory.ClassFactory.aClass;
+import static com.github.jonathanxd.codeapi.factory.MethodFactory.method;
+
+public class LiteralBugTest {
+
+
+    @Test
+    public void literalBugTest() throws Throwable {
+        CodeSource source = sourceOfParts(
+                method(EnumSet.of(PUBLIC), "test", VOID, new CodeParameter[]{},
+                        sourceOfParts(
+                                Predefined.invokePrintln(Literals.CLASS(Integer.class))
+                        )
+                )
+        );
+
+        TypeDeclaration decl = aClass(EnumSet.of(PUBLIC), "com.MyClass", source);
+
+        BytecodeGenerator bytecodeGenerator = new BytecodeGenerator();
+
+        BytecodeClass[] gen = bytecodeGenerator.gen(decl);
+
+        ResultSaver.save(this.getClass(), gen);
+
+        CodeClassLoader codeClassLoader = new CodeClassLoader();
+
+        Class<?> define = codeClassLoader.define(gen);
+
+        define.getDeclaredMethod("test").invoke(define.newInstance());
+
+
+    }
+}

src/test/resources/disassembled/LiteralBugTest_MyClass_Result.class.disassembled

@@ -0,0 +1,46 @@
+md5: f08e583d0e08e79c9171c65bfb8eec6d
+
+version: Java 8 (52)
+access: ACC_PUBLIC (33)
+
+source: MyClass.cai
+
+public class com.MyClass extends java.lang.Object {
+
+    !access: ACC_PUBLIC (1)
+    public void test() {
+      desc: ()V 
+      maxStack: 2, maxLocals: 1 
+      Label_0:
+        getstatic java.lang.System.out (type: java.io.PrintStream)
+        ldc Ljava/lang/Integer;              // type: java.lang.Class
+        invokevirtual java.io.PrintStream.println(java.lang.Object)void (ownerIsInterface: false)
+        return
+      Label_1:
+      LocalVariables {
+        index: 0, name: this, start: Label_0, end: Label_1, type: com.MyClass, signature: null
+      }
+    }
+    
+    !access: ACC_PUBLIC (1)
+    public void <init>() {
+      desc: ()V 
+      maxStack: 1, maxLocals: 1 
+      Label_0:
+        aload 0
+        invokespecial java.lang.Object.<init>()void (ownerIsInterface: false)
+        return
+      Label_1:
+      LocalVariables {
+        index: 0, name: this, start: Label_0, end: Label_1, type: com.MyClass, signature: null
+      }
+    }
+    
+    !access: PACKAGE_PRIVATE, ACC_STATIC (8)
+    static void <clinit>() {
+      desc: ()V 
+      maxStack: 0, maxLocals: 0 
+        return
+    }
+    
+}