Upgrade ASM for Java 11 support

Lenny Halseth · Lenny Halseth · commit ddab576e7c8d · 2018-11-27T15:40:51.000-05:00
diff --git a/agent/src/main/java/com/codedx/codepulse/agent/trace/InstrumentationClassVisitor.java b/agent/src/main/java/com/codedx/codepulse/agent/trace/InstrumentationClassVisitor.java
@@ -32,7 +32,7 @@ public class InstrumentationClassVisitor extends ClassVisitor {
     private LinkedList<InstrumentationMethodVisitor> inspectors = new LinkedList<>();
 
     public InstrumentationClassVisitor() {
-        super(Opcodes.ASM5);
+        super(Opcodes.ASM7);
     }
 
     public BitSet getLineNumbers() {
diff --git a/agent/src/main/java/com/codedx/codepulse/agent/trace/InstrumentationMethodVisitor.java b/agent/src/main/java/com/codedx/codepulse/agent/trace/InstrumentationMethodVisitor.java
@@ -32,7 +32,7 @@ public class InstrumentationMethodVisitor extends MethodVisitor {
 
     public InstrumentationMethodVisitor()
     {
-        super(Opcodes.ASM5);
+        super(Opcodes.ASM7);
     }
 
     public BitSet getLineNumbers() { return lineNumbers; }
diff --git a/bytefrog/filter-injector/src/main/java/com/codedx/bytefrog/filterinjector/FilterInjector.java b/bytefrog/filter-injector/src/main/java/com/codedx/bytefrog/filterinjector/FilterInjector.java
@@ -69,7 +69,7 @@ private class Visitor extends ClassVisitor {
 		private Adapter adapter = null;
 
 		public Visitor() {
-			super(Opcodes.ASM5);
+			super(Opcodes.ASM7);
 		}
 
 		public Adapter getAdapter() {
diff --git a/bytefrog/filter-injector/src/main/java/com/codedx/bytefrog/filterinjector/adapters/JettyAdapter.java b/bytefrog/filter-injector/src/main/java/com/codedx/bytefrog/filterinjector/adapters/JettyAdapter.java
@@ -53,7 +53,7 @@ private static class Visitor extends ClassVisitor {
 		private final InjectableFilter filter;
 
 		public Visitor(final ClassVisitor cv, final InjectableFilter filter) {
-			super(Opcodes.ASM5, cv);
+			super(Opcodes.ASM7, cv);
 			this.filter = filter;
 		}
 
@@ -78,7 +78,7 @@ private static class ConstructorInstrumentor extends MethodVisitor {
 		private final InjectableFilter filter;
 
 		public ConstructorInstrumentor(final MethodVisitor mv, final String className, final InjectableFilter filter) {
-			super(Opcodes.ASM5, mv);
+			super(Opcodes.ASM7, mv);
 
 			this.className = className;
 			this.filter = filter;
diff --git a/bytefrog/filter-injector/src/main/java/com/codedx/bytefrog/filterinjector/adapters/TomcatAdapter.java b/bytefrog/filter-injector/src/main/java/com/codedx/bytefrog/filterinjector/adapters/TomcatAdapter.java
@@ -89,7 +89,7 @@ private static class Visitor extends ClassVisitor {
 		private final InjectableFilter filter;
 
 		public Visitor(final ClassVisitor cv, final Type filterDef, final Type filterMap, final InjectableFilter filter) {
-			super(Opcodes.ASM5, cv);
+			super(Opcodes.ASM7, cv);
 
 			this.filterDef = filterDef;
 			this.filterMap = filterMap;
@@ -118,7 +118,7 @@ private static class ConstructorInstrumentor extends MethodVisitor {
 		private final InjectableFilter filter;
 
 		public ConstructorInstrumentor(final MethodVisitor mv, final String className, final Type filterDef, final Type filterMap, final InjectableFilter filter) {
-			super(Opcodes.ASM5, mv);
+			super(Opcodes.ASM7, mv);
 
 			this.className = className;
 			this.filterDef = filterDef;
diff --git a/bytefrog/instrumentation/src/main/java/com/codedx/bytefrog/instrumentation/ClassInspector.java b/bytefrog/instrumentation/src/main/java/com/codedx/bytefrog/instrumentation/ClassInspector.java
@@ -37,7 +37,7 @@ public class ClassInspector extends ClassVisitor {
 	private LinkedList<MethodInspector> inspectors = new LinkedList<>();
 
 	public ClassInspector() {
-		super(Opcodes.ASM5);
+		super(Opcodes.ASM7);
 	}
 
 	@Override public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
diff --git a/bytefrog/instrumentation/src/main/java/com/codedx/bytefrog/instrumentation/ClassInstrumentor.java b/bytefrog/instrumentation/src/main/java/com/codedx/bytefrog/instrumentation/ClassInstrumentor.java
@@ -41,7 +41,7 @@ public class ClassInstrumentor extends ClassVisitor {
 	public String getName() { return name; }
 
 	public ClassInstrumentor(final ClassVisitor cv, final MethodIdentifier methodIdentifier, final int classId, final ClassInspector.Result inspection, final TraceHandler handler) {
-		super(Opcodes.ASM5, cv);
+		super(Opcodes.ASM7, cv);
 		this.classId = classId;
 		this.methodIdentifier = methodIdentifier;
 		this.inspection = inspection;
diff --git a/bytefrog/instrumentation/src/main/java/com/codedx/bytefrog/instrumentation/MethodInspector.java b/bytefrog/instrumentation/src/main/java/com/codedx/bytefrog/instrumentation/MethodInspector.java
@@ -31,7 +31,7 @@ public class MethodInspector extends MethodVisitor {
 	private int startLine = 0, endLine = 0;
 
 	public MethodInspector(String methodName, String methodDesc) {
-		super(Opcodes.ASM5);
+		super(Opcodes.ASM7);
 		this.methodName = methodName;
 		this.methodDesc = methodDesc;
 	}
diff --git a/bytefrog/instrumentation/src/main/java/com/codedx/bytefrog/instrumentation/MethodInstrumentor.java b/bytefrog/instrumentation/src/main/java/com/codedx/bytefrog/instrumentation/MethodInstrumentor.java
@@ -65,7 +65,7 @@ public NewLocation(Label original, Label replacement) {
 	private final List<NewLocation> newReplacementLocations = new ArrayList<>();
 
 	public MethodInstrumentor(final ClassInstrumentor ci, final MethodVisitor mv, final int access, final String methodName, final String desc, final int methodId, final MethodInspector.Result inspection, final TraceHandler handler) {
-		super(Opcodes.ASM5, mv, access, methodName, desc);
+		super(Opcodes.ASM7, mv, access, methodName, desc);
 
 		this.ci = ci;
 		this.access = access;
diff --git a/bytefrog/project/Dependencies.scala b/bytefrog/project/Dependencies.scala
@@ -3,8 +3,8 @@ import sbt._
 object Dependencies {
 	lazy val minlog = "com.esotericsoftware" % "minlog" % "1.3.0"
 	lazy val asm = Seq(
-		"org.ow2.asm" % "asm" % "6.0",
-		"org.ow2.asm" % "asm-commons" % "6.0"
+		"org.ow2.asm" % "asm" % "7.0",
+		"org.ow2.asm" % "asm-commons" % "7.0"
 	)
 
 	// for testing
diff --git a/codepulse/src/main/scala/com/secdec/codepulse/data/bytecode/MethodContentVisitor.scala b/codepulse/src/main/scala/com/secdec/codepulse/data/bytecode/MethodContentVisitor.scala
@@ -39,7 +39,7 @@ object AsmVisitors {
 	}
 }
 
-class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends MethodVisitor(Opcodes.ASM5) {
+class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends MethodVisitor(Opcodes.ASM7) {
 	private var instructionCounter = 0
 	private var lineCounter = 0
 
@@ -63,7 +63,7 @@ class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends
 	override def visitLineNumber(line: Int, start: Label): Unit = lineCounter += 1
 }
 
-class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends ClassVisitor(Opcodes.ASM5) {
+class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends ClassVisitor(Opcodes.ASM7) {
 	private var classSignature = ""
 	private var classFile = ""
 
diff --git a/codepulse/src/main/scala/com/secdec/codepulse/data/bytecode/parse/JVMSignatureConverter.scala b/codepulse/src/main/scala/com/secdec/codepulse/data/bytecode/parse/JVMSignatureConverter.scala
@@ -113,7 +113,7 @@ object JVMSignatureConverter {
 	/** ASM SignatureVisitor that accumulates all of the "visitX" instructions
 	  * to a list of `SigPart`s, which can be retrieved by calling `result()`.
 	  */
-	class SigPartCollectingVisitor extends SignatureVisitor(Opcodes.ASM5) {
+	class SigPartCollectingVisitor extends SignatureVisitor(Opcodes.ASM7) {
 		private val parts = List.newBuilder[SigPart]
 		private def add(part: SigPart): this.type = {
 			parts += part
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -44,8 +44,8 @@ object Dependencies {
 	lazy val concLinkedHashMap = "com.googlecode.concurrentlinkedhashmap" % "concurrentlinkedhashmap-lru" % "1.2_jdk5"
 	lazy val minlog = "com.esotericsoftware" % "minlog" % "1.3.0"
 	lazy val asm = Seq(
-		"org.ow2.asm" % "asm" % "6.0",
-		"org.ow2.asm" % "asm-commons" % "6.0"
+		"org.ow2.asm" % "asm" % "7.0",
+		"org.ow2.asm" % "asm-commons" % "7.0"
 	)
 	lazy val jsonb = Seq(
 		"javax.json" % "javax.json-api" % "1.1",

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public class InstrumentationClassVisitor extends ClassVisitor {`
`32`	`32`	`private LinkedList<InstrumentationMethodVisitor> inspectors = new LinkedList<>();`
`33`	`33`
`34`	`34`	`public InstrumentationClassVisitor() {`
`35`		`- super(Opcodes.ASM5);`
	`35`	`+ super(Opcodes.ASM7);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public BitSet getLineNumbers() {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ private class Visitor extends ClassVisitor {`
`69`	`69`	`private Adapter adapter = null;`
`70`	`70`
`71`	`71`	`public Visitor() {`
`72`		`- super(Opcodes.ASM5);`
	`72`	`+ super(Opcodes.ASM7);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public Adapter getAdapter() {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public class ClassInspector extends ClassVisitor {`
`37`	`37`	`private LinkedList<MethodInspector> inspectors = new LinkedList<>();`
`38`	`38`
`39`	`39`	`public ClassInspector() {`
`40`		`- super(Opcodes.ASM5);`
	`40`	`+ super(Opcodes.ASM7);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Override public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public class MethodInspector extends MethodVisitor {`
`31`	`31`	`private int startLine = 0, endLine = 0;`
`32`	`32`
`33`	`33`	`public MethodInspector(String methodName, String methodDesc) {`
`34`		`- super(Opcodes.ASM5);`
	`34`	`+ super(Opcodes.ASM7);`
`35`	`35`	`this.methodName = methodName;`
`36`	`36`	`this.methodDesc = methodDesc;`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ object AsmVisitors {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`-class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends MethodVisitor(Opcodes.ASM5) {`
	`42`	`+class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends MethodVisitor(Opcodes.ASM7) {`
`43`	`43`	`private var instructionCounter = 0`
`44`	`44`	`private var lineCounter = 0`
`45`	`45`
`@@ -63,7 +63,7 @@ class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends`
`63`	`63`	`override def visitLineNumber(line: Int, start: Label): Unit = lineCounter += 1`
`64`	`64`	`}`
`65`	`65`
`66`		`-class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends ClassVisitor(Opcodes.ASM5) {`
	`66`	`+class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends ClassVisitor(Opcodes.ASM7) {`
`67`	`67`	`private var classSignature = ""`
`68`	`68`	`private var classFile = ""`
`69`	`69`