Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2909 fix stack calculation 

double and long require 2 positions on the stack.
This commit is contained in:
Mark Struberg 2023-05-04 19:53:11 +02:00
parent 7532498e7a
commit ecff638a02
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
View File

@ -596,14 +596,19 @@ public class ProxyManagerImpl
private static boolean isProxyable(Class<?> cls){ private static boolean isProxyable(Class<?> cls){
int mod = cls.getModifiers(); int mod = cls.getModifiers();
if(Modifier.isFinal(mod)) if(Modifier.isFinal(mod)) {
return false; return false;
if(Modifier.isProtected(mod) || Modifier.isPublic(mod)) }
if(Modifier.isProtected(mod) || Modifier.isPublic(mod)) {
return true; return true;
}
// Default scoped class, we can only extend if it is in the same package as the generated proxy. Ideally // Default scoped class, we can only extend if it is in the same package as the generated proxy. Ideally
// we'd fix the code gen portion and place proxies in the same pacakge as the types being proxied. // we'd fix the code gen portion and place proxies in the same pacakge as the types being proxied.
if(cls.getPackage().getName().equals("org.apache.openjpa.util")) if(cls.getPackage().getName().equals("org.apache.openjpa.util")) {
return true; return true;
}
return false; return false;
@ -891,8 +896,7 @@ public class ProxyManagerImpl
continue; continue;
} }
if (!startsWith(meth.getName(), "set") if (!startsWith(meth.getName(), "set") || meth.getParameterTypes().length != 1) {
|| meth.getParameterTypes().length != 1) {
continue; continue;
} }
@ -1381,9 +1385,10 @@ public class ProxyManagerImpl
MethodVisitor mv = ct.visitMethod(Opcodes.ACC_PUBLIC, "<init>", descriptor, null, exceptionTypes); MethodVisitor mv = ct.visitMethod(Opcodes.ACC_PUBLIC, "<init>", descriptor, null, exceptionTypes);
mv.visitCode(); mv.visitCode();
mv.visitVarInsn(Opcodes.ALOAD, 0); mv.visitVarInsn(Opcodes.ALOAD, 0);
for (int i = 1; i <= params.length; i++) int stackPos = 1;
{ for (Class param : params) {
mv.visitVarInsn(AsmHelper.getLoadInsn(params[i-1]), i); mv.visitVarInsn(AsmHelper.getLoadInsn(param), stackPos);
stackPos += Type.getType(param).getSize();
} }
mv.visitMethodInsn(Opcodes.INVOKESPECIAL, superClassFileNname, "<init>", descriptor, false); mv.visitMethodInsn(Opcodes.INVOKESPECIAL, superClassFileNname, "<init>", descriptor, false);
@ -1718,13 +1723,13 @@ public class ProxyManagerImpl
for (Method meth : meths) { for (Method meth : meths) {
if (isSetter(meth) && !Modifier.isFinal(meth.getModifiers())) { if (isSetter(meth) && !Modifier.isFinal(meth.getModifiers())) {
setters++; setters++;
proxySetter(ct, proxyClassDef, type, meth); proxySetter(ct, type, meth);
} }
} }
return setters > 0; return setters > 0;
} }
private void proxySetter(ClassWriterTracker ct, String proxyClassDef, Class type, Method meth) { private void proxySetter(ClassWriterTracker ct, Class type, Method meth) {
Class[] params = meth.getParameterTypes(); Class[] params = meth.getParameterTypes();
Class ret = meth.getReturnType(); Class ret = meth.getReturnType();
@ -1744,9 +1749,11 @@ public class ProxyManagerImpl
mv.visitVarInsn(Opcodes.ALOAD, 0); mv.visitVarInsn(Opcodes.ALOAD, 0);
// push all the method params to the stack // push all the method params to the stack
for (int i = 1; i <= params.length; i++) int stackPos = 1;
{ for (int i = 1; i <= params.length; i++) {
mv.visitVarInsn(AsmHelper.getLoadInsn(params[i-1]), i); Class param = params[i-1];
mv.visitVarInsn(AsmHelper.getLoadInsn(param), stackPos);
stackPos += Type.getType(param).getSize();
} }
mv.visitMethodInsn(Opcodes.INVOKESPECIAL, Type.getInternalName(type), meth.getName(), mv.visitMethodInsn(Opcodes.INVOKESPECIAL, Type.getInternalName(type), meth.getName(),