Fixed issue with ASM usage

Steve Salas · Steve Salas · commit 7251c575b347 · 2018-01-04T13:08:14.000-05:00
Constructs ClassVisitor and MethodVisitor using Opcodes.ASM5 instead of
OpCodes.ASM4.
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.ASM4) {
+class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends MethodVisitor(Opcodes.ASM5) {
 	private var instructionCounter = 0
 
 	def inc() = instructionCounter += 1
@@ -61,7 +61,7 @@ class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends
 	override def visitVarInsn(opcode: Int, v: Int): Unit = inc()
 }
 
-class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends ClassVisitor(Opcodes.ASM4) {
+class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends ClassVisitor(Opcodes.ASM5) {
 	private var classSignature = ""
 
 	override def visit(version: Int, access: Int, name: String, signature: String, superName: String, interfaces: Array[String]) = {
@@ -75,4 +75,4 @@ class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends
 		}
 		new MethodContentVisitor(counterCallback)
 	}
-}
+}

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.ASM4) {`
	`42`	`+class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends MethodVisitor(Opcodes.ASM5) {`
`43`	`43`	`private var instructionCounter = 0`
`44`	`44`
`45`	`45`	`def inc() = instructionCounter += 1`
`@@ -61,7 +61,7 @@ class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends`
`61`	`61`	`override def visitVarInsn(opcode: Int, v: Int): Unit = inc()`
`62`	`62`	`}`
`63`	`63`
`64`		`-class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends ClassVisitor(Opcodes.ASM4) {`
	`64`	`+class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends ClassVisitor(Opcodes.ASM5) {`
`65`	`65`	`private var classSignature = ""`
`66`	`66`
`67`	`67`	`override def visit(version: Int, access: Int, name: String, signature: String, superName: String, interfaces: Array[String]) = {`
`@@ -75,4 +75,4 @@ class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends`
`75`	`75`	`}`
`76`	`76`	`new MethodContentVisitor(counterCallback)`
`77`	`77`	`}`
`78`		`-}`
	`78`	`+}`