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

Add try/catch block around method transformations

Browse Source
This commit is contained in:
Denis Zharkov
2016-06-28 15:27:30 +03:00
parent c2ac49ec96
commit ae46c726fc
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/TransformationMethodVisitor.java
+22 -17
View File
@@ -58,25 +58,30 @@ public abstract class TransformationMethodVisitor extends MethodVisitor {
super.visitEnd(); super.visitEnd();
if (shouldBeTransformed(methodNode)) { try {
performTransformations(methodNode); if (shouldBeTransformed(methodNode)) {
} performTransformations(methodNode);
methodNode.accept(new EndIgnoringMethodVisitorDecorator(Opcodes.ASM5, delegate));
// In case of empty instructions list MethodNode.accept doesn't call visitLocalVariables of delegate
// So we just do it here
if (methodNode.instructions.size() == 0) {
List<LocalVariableNode> localVariables = methodNode.localVariables;
// visits local variables
int n = localVariables == null ? 0 : localVariables.size();
for (int i = 0; i < n; ++i) {
localVariables.get(i).accept(delegate);
} }
}
delegate.visitEnd(); methodNode.accept(new EndIgnoringMethodVisitorDecorator(Opcodes.ASM5, delegate));
// In case of empty instructions list MethodNode.accept doesn't call visitLocalVariables of delegate
// So we just do it here
if (methodNode.instructions.size() == 0) {
List<LocalVariableNode> localVariables = methodNode.localVariables;
// visits local variables
int n = localVariables == null ? 0 : localVariables.size();
for (int i = 0; i < n; ++i) {
localVariables.get(i).accept(delegate);
}
}
delegate.visitEnd();
}
catch (Throwable t) {
throw new CompilationException("Couldn't transform method node: " + InlineCodegenUtil.getNodeText(methodNode), t, null);
}
} }
protected abstract void performTransformations(@NotNull MethodNode methodNode); protected abstract void performTransformations(@NotNull MethodNode methodNode);