fix pushing of constant classes on the stack with ASM when using prim…

…itive types
jscattergood · May 4, 2012 · 55a8977 · 55a8977
1 parent dd573ce
commit 55a8977
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
@@ -664,7 +664,7 @@ private void _finishJIT() {
 
     mv = cw.visitMethod(ACC_PUBLIC, "getKnownEgressType", "()Ljava/lang/Class;", null, null);
     mv.visitCode();
-    mv.visitLdcInsn(org.mvel2.asm.Type.getType(returnType != null ? returnType : Object.class));
+    visitConstantClass(returnType);
     mv.visitInsn(ARETURN);
 
     mv.visitMaxs(1, 1);
@@ -697,6 +697,15 @@ private void _finishJIT() {
 
   }
 
+  private void visitConstantClass(Class<?> clazz) {
+    if (clazz == null) clazz = Object.class;
+    if (clazz.isPrimitive()) {
+        mv.visitFieldInsn(GETSTATIC, toNonPrimitiveType(clazz).getName().replace(".", "/"), "TYPE", "Ljava/lang/Class;");
+    } else {
+        mv.visitLdcInsn(org.mvel2.asm.Type.getType(clazz));
+    }
+  }
+
   private Accessor _initializeAccessor() throws Exception {
     if (deferFinish) {
       return null;