github-repos/testable-mock
1
0
Fork 0
mirror of https://github.com/alibaba/testable-mock.git synced 2025-01-10 20:30:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix method node stack change

Browse Source
This commit is contained in:
金戟 2020-12-30 22:38:17 +08:00
parent 783b127bbb
commit 68075a2ead
3 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
testable-agent/src/main/java/com/alibaba/testable/agent/handler/SourceClassHandler.java
View File

@ -2,6 +2,7 @@ package com.alibaba.testable.agent.handler;
import com.alibaba.testable.agent.constant.ConstPool; import com.alibaba.testable.agent.constant.ConstPool;
import com.alibaba.testable.agent.model.MethodInfo; import com.alibaba.testable.agent.model.MethodInfo;
import com.alibaba.testable.agent.model.ModifiedInsnNodes;
import com.alibaba.testable.agent.util.BytecodeUtil; import com.alibaba.testable.agent.util.BytecodeUtil;
import com.alibaba.testable.agent.util.ClassUtil; import com.alibaba.testable.agent.util.ClassUtil;
import com.alibaba.testable.core.util.LogUtil; import com.alibaba.testable.core.util.LogUtil;
@ -61,6 +62,7 @@ public class SourceClassHandler extends BaseClassHandler {
AbstractInsnNode[] instructions = mn.instructions.toArray(); AbstractInsnNode[] instructions = mn.instructions.toArray();
List<MethodInfo> memberInjectMethodList = new ArrayList<MethodInfo>(memberInjectMethods); List<MethodInfo> memberInjectMethodList = new ArrayList<MethodInfo>(memberInjectMethods);
int i = 0; int i = 0;
int maxStackDiff = 0;
do { do {
if (invokeOps.contains(instructions[i].getOpcode())) { if (invokeOps.contains(instructions[i].getOpcode())) {
MethodInsnNode node = (MethodInsnNode)instructions[i]; MethodInsnNode node = (MethodInsnNode)instructions[i];
@ -69,8 +71,10 @@ public class SourceClassHandler extends BaseClassHandler {
// it's a member or static method and an inject method for it exist // it's a member or static method and an inject method for it exist
int rangeStart = getMemberMethodStart(instructions, i); int rangeStart = getMemberMethodStart(instructions, i);
if (rangeStart >= 0) { if (rangeStart >= 0) {
instructions = replaceMemberCallOps(cn, mn, memberInjectMethodName, instructions, ModifiedInsnNodes modifiedInsnNodes = replaceMemberCallOps(cn, mn, memberInjectMethodName,
node.owner, node.getOpcode(), rangeStart, i); instructions, node.owner, node.getOpcode(), rangeStart, i);
instructions = modifiedInsnNodes.nodes;
maxStackDiff = Math.max(maxStackDiff, modifiedInsnNodes.stackDiff);
i = rangeStart; i = rangeStart;
} else { } else {
LogUtil.warn("Potential missed mocking at %s:%s", mn.name, getLineNum(instructions, i)); LogUtil.warn("Potential missed mocking at %s:%s", mn.name, getLineNum(instructions, i));
@ -82,7 +86,10 @@ public class SourceClassHandler extends BaseClassHandler {
// and an inject method for it exist // and an inject method for it exist
int rangeStart = getConstructorStart(instructions, node.owner, i); int rangeStart = getConstructorStart(instructions, node.owner, i);
if (rangeStart >= 0) { if (rangeStart >= 0) {
instructions = replaceNewOps(cn, mn, newOperatorInjectMethodName, instructions, rangeStart, i); ModifiedInsnNodes modifiedInsnNodes = replaceNewOps(cn, mn, newOperatorInjectMethodName,
instructions, rangeStart, i);
instructions = modifiedInsnNodes.nodes;
maxStackDiff = Math.max(maxStackDiff, modifiedInsnNodes.stackDiff);
i = rangeStart; i = rangeStart;
} }
} }
@ -90,6 +97,7 @@ public class SourceClassHandler extends BaseClassHandler {
} }
i++; i++;
} while (i < instructions.length); } while (i < instructions.length);
mn.maxStack += maxStackDiff;
} }
private String getMemberInjectMethodName(List<MethodInfo> memberInjectMethodList, MethodInsnNode node) { private String getMemberInjectMethodName(List<MethodInfo> memberInjectMethodList, MethodInsnNode node) {
@ -176,7 +184,7 @@ public class SourceClassHandler extends BaseClassHandler {
return ClassUtil.getParameterTypes(desc).size() - (ClassUtil.getReturnType(desc).isEmpty() ? 0 : 1); return ClassUtil.getParameterTypes(desc).size() - (ClassUtil.getReturnType(desc).isEmpty() ? 0 : 1);
} }
private AbstractInsnNode[] replaceNewOps(ClassNode cn, MethodNode mn, String newOperatorInjectMethodName, private ModifiedInsnNodes replaceNewOps(ClassNode cn, MethodNode mn, String newOperatorInjectMethodName,
AbstractInsnNode[] instructions, int start, int end) { AbstractInsnNode[] instructions, int start, int end) {
LogUtil.diagnose(" Line %d, mock method %s used", getLineNum(instructions, start), LogUtil.diagnose(" Line %d, mock method %s used", getLineNum(instructions, start),
newOperatorInjectMethodName); newOperatorInjectMethodName);
@ -188,7 +196,7 @@ public class SourceClassHandler extends BaseClassHandler {
mn.instructions.remove(instructions[start]); mn.instructions.remove(instructions[start]);
mn.instructions.remove(instructions[start + 1]); mn.instructions.remove(instructions[start + 1]);
mn.instructions.remove(instructions[end]); mn.instructions.remove(instructions[end]);
return mn.instructions.toArray(); return new ModifiedInsnNodes(mn.instructions.toArray(), 0);
} }
private int getLineNum(AbstractInsnNode[] instructions, int start) { private int getLineNum(AbstractInsnNode[] instructions, int start) {
@ -205,7 +213,7 @@ public class SourceClassHandler extends BaseClassHandler {
ClassUtil.toByteCodeClassName(classType); ClassUtil.toByteCodeClassName(classType);
} }
private AbstractInsnNode[] replaceMemberCallOps(ClassNode cn, MethodNode mn, String substitutionMethod, private ModifiedInsnNodes replaceMemberCallOps(ClassNode cn, MethodNode mn, String substitutionMethod,
AbstractInsnNode[] instructions, String ownerClass, AbstractInsnNode[] instructions, String ownerClass,
int opcode, int start, int end) { int opcode, int start, int end) {
LogUtil.diagnose(" Line %d, mock method %s used", getLineNum(instructions, start), substitutionMethod); LogUtil.diagnose(" Line %d, mock method %s used", getLineNum(instructions, start), substitutionMethod);
@ -223,7 +231,7 @@ public class SourceClassHandler extends BaseClassHandler {
mn.instructions.insertBefore(instructions[end], new MethodInsnNode(INVOKESTATIC, testClassName, mn.instructions.insertBefore(instructions[end], new MethodInsnNode(INVOKESTATIC, testClassName,
substitutionMethod, addFirstParameter(method.desc, ClassUtil.fitCompanionClassName(ownerClass)), false)); substitutionMethod, addFirstParameter(method.desc, ClassUtil.fitCompanionClassName(ownerClass)), false));
mn.instructions.remove(instructions[end]); mn.instructions.remove(instructions[end]);
return mn.instructions.toArray(); return new ModifiedInsnNodes(mn.instructions.toArray(), 1);
} }
private boolean isCompanionMethod(String ownerClass, int opcode) { private boolean isCompanionMethod(String ownerClass, int opcode) {

1
testable-agent/src/main/java/com/alibaba/testable/agent/handler/TestClassHandler.java
View File

@ -60,6 +60,7 @@ public class TestClassHandler extends BaseClassHandler {
il.add(new FieldInsnNode(PUTSTATIC, cn.name, REF_TESTABLE_CONTEXT, il.add(new FieldInsnNode(PUTSTATIC, cn.name, REF_TESTABLE_CONTEXT,
ClassUtil.toByteCodeClassName(CLASS_MOCK_CONTEXT))); ClassUtil.toByteCodeClassName(CLASS_MOCK_CONTEXT)));
mn.instructions.insertBefore(mn.instructions.get(0), il); mn.instructions.insertBefore(mn.instructions.get(0), il);
mn.maxStack++;
} }
private void handleMockMethod(ClassNode cn, MethodNode mn) { private void handleMockMethod(ClassNode cn, MethodNode mn) {

16
testable-agent/src/main/java/com/alibaba/testable/agent/model/ModifiedInsnNodes.java Normal file
View File

@ -0,0 +1,16 @@
package com.alibaba.testable.agent.model;
import org.objectweb.asm.tree.AbstractInsnNode;
public class ModifiedInsnNodes {
public AbstractInsnNode[] nodes;
public int stackDiff;
public ModifiedInsnNodes(AbstractInsnNode[] nodes, int stackDiff) {
this.nodes = nodes;
this.stackDiff = stackDiff;
}
}