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

OPENJPA-2911 addManagedFieldCountMethod in ASM

This commit is contained in:
Mark Struberg 2023-06-06 20:22:11 +02:00
parent 972b5d0e62
commit 6164d355a6
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
View File

@ -1341,12 +1341,14 @@ public class PCEnhancer {
*/ */
private void addPCMethods(ClassNodeTracker classNodeTracker) throws NoSuchMethodException { private void addPCMethods(ClassNodeTracker classNodeTracker) throws NoSuchMethodException {
addClearFieldsMethod(classNodeTracker.getClassNode()); addClearFieldsMethod(classNodeTracker.getClassNode());
addNewInstanceMethod(classNodeTracker.getClassNode(), true); addNewInstanceMethod(classNodeTracker.getClassNode(), true);
addNewInstanceMethod(classNodeTracker.getClassNode(), false); addNewInstanceMethod(classNodeTracker.getClassNode(), false);
addManagedFieldCountMethod(classNodeTracker.getClassNode());
AsmHelper.readIntoBCClass(classNodeTracker, _pc); AsmHelper.readIntoBCClass(classNodeTracker, _pc);
addManagedFieldCountMethod();
addReplaceFieldsMethods(); addReplaceFieldsMethods();
addProvideFieldsMethods(); addProvideFieldsMethods();
addCopyFieldsMethod(); addCopyFieldsMethod();
@ -1518,13 +1520,12 @@ public class PCEnhancer {
* method to the bytecode, returning the inherited field count added * method to the bytecode, returning the inherited field count added
* to the number of managed fields in the current PersistenceCapable class. * to the number of managed fields in the current PersistenceCapable class.
*/ */
private void addManagedFieldCountMethod() { private void addManagedFieldCountMethod(ClassNode classNode) {
// protected static int pcGetManagedFieldCount () MethodNode getFieldCountMeth = new MethodNode(Opcodes.ACC_PROTECTED | Opcodes.ACC_STATIC,
BCMethod method = _pc.declareMethod(PRE + "GetManagedFieldCount", PRE + "GetManagedFieldCount",
int.class, null); Type.getMethodDescriptor(Type.INT_TYPE),
method.setStatic(true); null, null);
method.makeProtected(); classNode.methods.add(getFieldCountMeth);
Code code = method.getCode(true);
// return <fields> + pcInheritedFieldCount // return <fields> + pcInheritedFieldCount
// awhite: the above should work, but I'm seeing a messed up situation // awhite: the above should work, but I'm seeing a messed up situation
@ -1532,18 +1533,21 @@ public class PCEnhancer {
// happens before <clinit> is ever invoked, and so our // happens before <clinit> is ever invoked, and so our
// pcInheritedFieldCount field isn't initialized! so instead, // pcInheritedFieldCount field isn't initialized! so instead,
// return <fields> + <superclass>.pcGetManagedFieldCount () // return <fields> + <superclass>.pcGetManagedFieldCount ()
code.constant().setValue(_meta.getDeclaredFields().length); final InsnList instructions = getFieldCountMeth.instructions;
instructions.add(new LdcInsnNode(_meta.getDeclaredFields().length));
if (_meta.getPCSuperclass() != null) { if (_meta.getPCSuperclass() != null) {
Class superClass = getType(_meta.getPCSuperclassMetaData()); Class superClass = getType(_meta.getPCSuperclassMetaData());
String superName = getCreateSubclass() ? String superName = getCreateSubclass() ?
PCEnhancer.toPCSubclassName(superClass) : PCEnhancer.toPCSubclassName(superClass).replace(".", "/") :
superClass.getName(); Type.getInternalName(superClass);
code.invokestatic().setMethod(superName, instructions.add(new MethodInsnNode(Opcodes.INVOKESTATIC,
PRE + "GetManagedFieldCount", int.class.getName(), null); superName,
code.iadd(); PRE + "GetManagedFieldCount",
Type.getMethodDescriptor(Type.INT_TYPE)));
instructions.add(new InsnNode(Opcodes.IADD));
} }
code.ireturn();
code.calculateMaxStack(); instructions.add(new InsnNode(Opcodes.IRETURN));
} }
/** /**