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

stack size increase should be cumulated

Browse Source
This commit is contained in:
金戟 2021-02-20 22:38:22 +08:00
parent 23a0a0cd90
commit cfc28467bb
2 changed files with 8 additions and 30 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

@ -1,7 +1,6 @@
package com.alibaba.testable.agent.handler; package com.alibaba.testable.agent.handler;
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.agent.util.MethodUtil; import com.alibaba.testable.agent.util.MethodUtil;
@ -62,7 +61,6 @@ public class SourceClassHandler extends BaseClassHandler {
return; return;
} }
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];
@ -74,10 +72,7 @@ public class SourceClassHandler extends BaseClassHandler {
// it's a new operation and an inject method for it exist // it's a new operation 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) {
ModifiedInsnNodes modifiedInsnNodes = replaceNewOps(mn, newOperatorInjectMethod, instructions = replaceNewOps(mn, newOperatorInjectMethod, instructions, rangeStart, i);
instructions, rangeStart, i);
instructions = modifiedInsnNodes.nodes;
maxStackDiff = Math.max(maxStackDiff, modifiedInsnNodes.stackDiff);
i = rangeStart; i = rangeStart;
} }
} }
@ -89,10 +84,8 @@ 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) {
ModifiedInsnNodes modifiedInsnNodes = replaceMemberCallOps(mn, mockMethod, instructions = replaceMemberCallOps(mn, mockMethod,
instructions, 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));
@ -102,7 +95,6 @@ public class SourceClassHandler extends BaseClassHandler {
} }
i++; i++;
} while (i < instructions.length); } while (i < instructions.length);
mn.maxStack += maxStackDiff;
} }
/** /**
@ -198,7 +190,7 @@ public class SourceClassHandler extends BaseClassHandler {
return MethodUtil.getParameterTypes(desc).size() - (MethodUtil.getReturnType(desc).equals(VOID_RES) ? 0 : 1); return MethodUtil.getParameterTypes(desc).size() - (MethodUtil.getReturnType(desc).equals(VOID_RES) ? 0 : 1);
} }
private ModifiedInsnNodes replaceNewOps(MethodNode mn, MethodInfo newOperatorInjectMethod, private AbstractInsnNode[] replaceNewOps(MethodNode mn, MethodInfo newOperatorInjectMethod,
AbstractInsnNode[] instructions, int start, int end) { AbstractInsnNode[] instructions, int start, int end) {
String mockMethodName = newOperatorInjectMethod.getMockName(); String mockMethodName = newOperatorInjectMethod.getMockName();
int invokeOpcode = newOperatorInjectMethod.isStatic() ? INVOKESTATIC : INVOKEVIRTUAL; int invokeOpcode = newOperatorInjectMethod.isStatic() ? INVOKESTATIC : INVOKEVIRTUAL;
@ -214,7 +206,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 new ModifiedInsnNodes(mn.instructions.toArray(), 0); return mn.instructions.toArray();
} }
private int getLineNum(AbstractInsnNode[] instructions, int start) { private int getLineNum(AbstractInsnNode[] instructions, int start) {
@ -231,7 +223,7 @@ public class SourceClassHandler extends BaseClassHandler {
ClassUtil.toByteCodeClassName(classType); ClassUtil.toByteCodeClassName(classType);
} }
private ModifiedInsnNodes replaceMemberCallOps(MethodNode mn, MethodInfo mockMethod, AbstractInsnNode[] instructions, private AbstractInsnNode[] replaceMemberCallOps(MethodNode mn, MethodInfo mockMethod, AbstractInsnNode[] instructions,
String ownerClass, int opcode, int start, int end) { String ownerClass, int opcode, 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),
mockMethod.getMockName()); mockMethod.getMockName());
@ -242,6 +234,7 @@ public class SourceClassHandler extends BaseClassHandler {
if (Opcodes.INVOKESTATIC == opcode || isCompanionMethod(ownerClass, opcode)) { if (Opcodes.INVOKESTATIC == opcode || isCompanionMethod(ownerClass, opcode)) {
// append a null value if it was a static invoke or in kotlin companion class // append a null value if it was a static invoke or in kotlin companion class
mn.instructions.insertBefore(instructions[start], new InsnNode(ACONST_NULL)); mn.instructions.insertBefore(instructions[start], new InsnNode(ACONST_NULL));
mn.maxStack++;
if (ClassUtil.isCompanionClassName(ownerClass)) { if (ClassUtil.isCompanionClassName(ownerClass)) {
// for kotlin companion class, remove the byte code of reference to "companion" static field // for kotlin companion class, remove the byte code of reference to "companion" static field
mn.instructions.remove(instructions[end - 1]); mn.instructions.remove(instructions[end - 1]);
@ -252,7 +245,8 @@ public class SourceClassHandler extends BaseClassHandler {
mn.instructions.insertBefore(instructions[end], new MethodInsnNode(invokeOpcode, mockClassName, mn.instructions.insertBefore(instructions[end], new MethodInsnNode(invokeOpcode, mockClassName,
mockMethod.getMockName(), mockMethod.getMockDesc(), false)); mockMethod.getMockName(), mockMethod.getMockDesc(), false));
mn.instructions.remove(instructions[end]); mn.instructions.remove(instructions[end]);
return new ModifiedInsnNodes(mn.instructions.toArray(), 1); mn.maxStack++;
return mn.instructions.toArray();
} }
private boolean isCompanionMethod(String ownerClass, int opcode) { private boolean isCompanionMethod(String ownerClass, int opcode) {

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

@ -1,16 +0,0 @@
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;
}
}