Remove ASM-based Java start line detection

Author: Lenny Halseth

codepulse/src/main/scala/com/secdec/codepulse/data/bytecode/MethodContentVisitor.scala

@@ -25,15 +25,15 @@ import java.io.InputStream
 
 object AsmVisitors {
 	// counterCallback(instructionCount)
-	type CounterCallback = (Int, Int, Int) => Unit
+	type CounterCallback = (Int, Int) => Unit
 
 	// methodCallback(methodSignature, instructionCount)
-	type MethodCallback = (String, String, Int, Int, Int) => Unit
+	type MethodCallback = (String, String, Int, Int) => Unit
 
 	def parseMethodsFromClass(classBytes: InputStream) = {
 		val reader = new ClassReader(classBytes)
-		val builder = List.newBuilder[(String, String, Int, Int, Int)]
-		val visitor = new ClassStructureVisitor2({ (file, sig, size, lineCount, methodStartLine) => builder += ((file, sig, size, lineCount, methodStartLine)) })
+		val builder = List.newBuilder[(String, String, Int, Int)]
+		val visitor = new ClassStructureVisitor2({ (file, sig, size, lineCount) => builder += ((file, sig, size, lineCount)) })
 		reader.accept(visitor, ClassReader.SKIP_FRAMES)
 		builder.result()
 	}
@@ -42,12 +42,10 @@ object AsmVisitors {
 class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends MethodVisitor(Opcodes.ASM5) {
 	private var instructionCounter = 0
 	private var lineCounter = 0
-	private var methodStart = false
-	private var methodStartLine = -1
 
 	def inc() = instructionCounter += 1
-	override def visitCode = { instructionCounter = 0; lineCounter = 0; methodStart = true; methodStartLine = -1 }
-	override def visitEnd = { counterCallback(instructionCounter, lineCounter, methodStartLine) }
+	override def visitCode = { instructionCounter = 0; lineCounter = 0 }
+	override def visitEnd = { counterCallback(instructionCounter, lineCounter) }
 
 	override def visitFieldInsn(opcode: Int, owner: String, name: String, desc: String): Unit = inc()
 	override def visitIincInsn(v: Int, amt: Int): Unit = inc()
@@ -62,15 +60,7 @@ class MethodContentVisitor(counterCallback: AsmVisitors.CounterCallback) extends
 	override def visitTableSwitchInsn(min: Int, max: Int, dflt: Label, labels: Label*): Unit = inc()
 	override def visitTypeInsn(opcode: Int, tp: String): Unit = inc()
 	override def visitVarInsn(opcode: Int, v: Int): Unit = inc()
-	override def visitLineNumber(line: Int, start: Label): Unit = {
-		lineCounter += 1
-
-		if(methodStart) {
-			methodStartLine = line
-			methodStart = false
-		}
-
-	}
+	override def visitLineNumber(line: Int, start: Label): Unit = lineCounter += 1
 }
 
 class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends ClassVisitor(Opcodes.ASM5) {
@@ -87,8 +77,8 @@ class ClassStructureVisitor2(methodCallback: AsmVisitors.MethodCallback) extends
 
 	override def visitMethod(access: Int, name: String, desc: String, sig: String, exceptions: Array[String]): MethodVisitor = {
 		val methodSignature = classSignature + "." + name + ";" + access + ";" + desc
-		val counterCallback: AsmVisitors.CounterCallback = (insnCount, lineCount, methodStartLine) => {
-			methodCallback(classFile, methodSignature, insnCount, lineCount, methodStartLine)
+		val counterCallback: AsmVisitors.CounterCallback = (insnCount, lineCount) => {
+			methodCallback(classFile, methodSignature, insnCount, lineCount)
 		}
 		new MethodContentVisitor(counterCallback)
 	}

codepulse/src/main/scala/com/secdec/codepulse/input/bytecode/ByteCodeProcessor.scala

@@ -133,7 +133,7 @@ class ByteCodeProcessor() extends LanguageProcessor with Loggable {
 					case "class" =>
 						val methods = AsmVisitors.parseMethodsFromClass(new CloseShieldInputStream(contents))
 						for {
-							(file, name, size, lineCount, methodStartLine) <- methods
+							(file, name, size, lineCount) <- methods
 							pkg = getPackageFromSig(name)
 							filePath = FilePath(Array(pkg, file).mkString("/"))
 							nestedPath = filePath.map(fp => entryPath match {