azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stack Height fix

Browse Source
This commit is contained in:
Mikhael Bogdanov
2014-01-28 11:21:56 +04:00
parent accccdfb77
commit ee61188188
1 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/asm/MethodInliner.java
+33 -37
View File
@@ -205,49 +205,45 @@ public class MethodInliner {
@NotNull @NotNull
public MethodNode prepareNode(@NotNull MethodNode node) { public MethodNode prepareNode(@NotNull MethodNode node) {
if (parameters.getCaptured().size() != 0) { final int capturedParamsSize = parameters.getCaptured().size();
final int capturedParamsSize = parameters.getCaptured().size(); final int realParametersSize = parameters.getReal().size();
final int realParametersSize = parameters.getReal().size(); Type[] types = Type.getArgumentTypes(node.desc);
Type[] types = Type.getArgumentTypes(node.desc); Type returnType = Type.getReturnType(node.desc);
Type returnType = Type.getReturnType(node.desc);
ArrayList<Type> capturedTypes = parameters.getCapturedTypes(); ArrayList<Type> capturedTypes = parameters.getCapturedTypes();
Type[] allTypes = ArrayUtil.mergeArrays(types, capturedTypes.toArray(new Type[capturedTypes.size()])); Type[] allTypes = ArrayUtil.mergeArrays(types, capturedTypes.toArray(new Type[capturedTypes.size()]));
MethodNode transformedNode = new MethodNode(node.access, node.name, Type.getMethodDescriptor(returnType, allTypes), node.signature, null) { MethodNode transformedNode = new MethodNode(node.access, node.name, Type.getMethodDescriptor(returnType, allTypes), node.signature, null) {
@Override @Override
public void visitVarInsn(int opcode, int var) { public void visitVarInsn(int opcode, int var) {
int newIndex; int newIndex;
if (var < realParametersSize) { if (var < realParametersSize) {
newIndex = var; newIndex = var;
} else { } else {
newIndex = var + capturedParamsSize; newIndex = var + capturedParamsSize;
}
super.visitVarInsn(opcode, newIndex);
} }
super.visitVarInsn(opcode, newIndex);
@Override
public void visitIincInsn(int var, int increment) {
int newIndex;
if (var < realParametersSize) {
newIndex = var;
} else {
newIndex = var + capturedParamsSize;
}
super.visitIincInsn(newIndex, increment);
}
};
node.accept(transformedNode);
transformedNode.visitMaxs(30, 30);
if (lambdaInfo != null) {
transformCaptured(transformedNode, parameters, lambdaInfo, lambdaFieldRemapper);
} }
return transformedNode;
}
return node; @Override
public void visitIincInsn(int var, int increment) {
int newIndex;
if (var < realParametersSize) {
newIndex = var;
} else {
newIndex = var + capturedParamsSize;
}
super.visitIincInsn(newIndex, increment);
}
};
node.accept(transformedNode);
transformedNode.visitMaxs(30, 30);
if (lambdaInfo != null) {
transformCaptured(transformedNode, parameters, lambdaInfo, lambdaFieldRemapper);
}
return transformedNode;
} }
protected MethodNode markPlacesForInlineAndRemoveInlinable(@NotNull MethodNode node) throws AnalyzerException { protected MethodNode markPlacesForInlineAndRemoveInlinable(@NotNull MethodNode node) throws AnalyzerException {