[FLINK-3143] update Closure Cleaner's ASM references to ASM5 - This solves errors with reflectasm using Scala 2.11 and Java 8
This closes #1445. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e28b62e0 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e28b62e0 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e28b62e0 Branch: refs/heads/master Commit: e28b62e0e2973b01ad5b08ce319aaf0e7ce4c087 Parents: 3de49f5 Author: Maximilian Michels <m...@apache.org> Authored: Wed Dec 9 11:42:09 2015 +0100 Committer: Maximilian Michels <m...@apache.org> Committed: Wed Dec 9 15:48:30 2015 +0100 ---------------------------------------------------------------------- .../org/apache/flink/api/java/ClosureCleaner.java | 6 +++--- .../org/apache/flink/api/scala/ClosureCleaner.scala | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/e28b62e0/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java ---------------------------------------------------------------------- diff --git a/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java b/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java index ec1ebd6..37cf8d3 100644 --- a/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java +++ b/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java @@ -105,7 +105,7 @@ class This0AccessFinder extends ClassVisitor { private String this0Name; public This0AccessFinder(String this0Name) { - super(Opcodes.ASM4); + super(Opcodes.ASM5); this.this0Name = this0Name; } @@ -115,7 +115,7 @@ class This0AccessFinder extends ClassVisitor { @Override public MethodVisitor visitMethod(int access, String name, String desc, String sig, String[] exceptions) { - return new MethodVisitor(Opcodes.ASM4) { + return new MethodVisitor(Opcodes.ASM5) { @Override public void visitFieldInsn(int op, String owner, String name, String desc) { @@ -125,4 +125,4 @@ class This0AccessFinder extends ClassVisitor { } }; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flink/blob/e28b62e0/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala ---------------------------------------------------------------------- diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala index aee57f5..00ffcfc 100644 --- a/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala +++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala @@ -253,11 +253,11 @@ object ClosureCleaner { } private[flink] -class ReturnStatementFinder extends ClassVisitor(ASM4) { +class ReturnStatementFinder extends ClassVisitor(ASM5) { override def visitMethod(access: Int, name: String, desc: String, sig: String, exceptions: Array[String]): MethodVisitor = { if (name.contains("apply")) { - new MethodVisitor(ASM4) { + new MethodVisitor(ASM5) { override def visitTypeInsn(op: Int, tp: String) { if (op == NEW && tp.contains("scala/runtime/NonLocalReturnControl")) { throw new InvalidProgramException("Return statements aren't allowed in Flink closures") @@ -265,16 +265,16 @@ class ReturnStatementFinder extends ClassVisitor(ASM4) { } } } else { - new MethodVisitor(ASM4) {} + new MethodVisitor(ASM5) {} } } } private[flink] -class FieldAccessFinder(output: Map[Class[_], Set[String]]) extends ClassVisitor(ASM4) { +class FieldAccessFinder(output: Map[Class[_], Set[String]]) extends ClassVisitor(ASM5) { override def visitMethod(access: Int, name: String, desc: String, sig: String, exceptions: Array[String]): MethodVisitor = { - new MethodVisitor(ASM4) { + new MethodVisitor(ASM5) { override def visitFieldInsn(op: Int, owner: String, name: String, desc: String) { if (op == GETFIELD) { for (cl <- output.keys if cl.getName == owner.replace('/', '.')) { @@ -297,7 +297,7 @@ class FieldAccessFinder(output: Map[Class[_], Set[String]]) extends ClassVisitor } } -private[flink] class InnerClosureFinder(output: Set[Class[_]]) extends ClassVisitor(ASM4) { +private[flink] class InnerClosureFinder(output: Set[Class[_]]) extends ClassVisitor(ASM5) { var myName: String = null override def visit(version: Int, access: Int, name: String, sig: String, @@ -307,7 +307,7 @@ private[flink] class InnerClosureFinder(output: Set[Class[_]]) extends ClassVisi override def visitMethod(access: Int, name: String, desc: String, sig: String, exceptions: Array[String]): MethodVisitor = { - new MethodVisitor(ASM4) { + new MethodVisitor(ASM5) { override def visitMethodInsn(op: Int, owner: String, name: String, desc: String) { val argTypes = Type.getArgumentTypes(desc)
