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

Optimization in NestedSourceMapper

Browse Source
This commit is contained in:
Michael Bogdanov
2016-04-19 15:52:05 +03:00
parent 636c13adde
commit f6edf311d7
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP2.kt
+9 -6
View File
@@ -30,20 +30,23 @@ open class NestedSourceMapper(
override val parent: SourceMapper, val ranges: List<RangeMapping>, sourceInfo: SourceInfo override val parent: SourceMapper, val ranges: List<RangeMapping>, sourceInfo: SourceInfo
) : DefaultSourceMapper(sourceInfo) { ) : DefaultSourceMapper(sourceInfo) {
val visited = TIntIntHashMap() val visitedLines = TIntIntHashMap()
var lastVisitedRange: RangeMapping? = null
override fun visitLineNumber(iv: MethodVisitor, lineNumber: Int, start: Label) { override fun visitLineNumber(iv: MethodVisitor, lineNumber: Int, start: Label) {
val mappedLineNumber = visited.get(lineNumber) val mappedLineNumber = visitedLines.get(lineNumber)
if (mappedLineNumber > 0) { if (mappedLineNumber > 0) {
iv.visitLineNumber(mappedLineNumber, start) iv.visitLineNumber(mappedLineNumber, start)
} else { } else {
val findMappingIfExists = findMappingIfExists(lineNumber)!! val rangeForMapping = if (lastVisitedRange?.contains(lineNumber) ?: false) lastVisitedRange!! else findMappingIfExists(lineNumber)!!
val sourceLineNumber = findMappingIfExists.mapDestToSource(lineNumber) val sourceLineNumber = rangeForMapping.mapDestToSource(lineNumber)
val visitLineNumber = parent.visitLineNumber(iv, start, sourceLineNumber, findMappingIfExists.parent!!.name, findMappingIfExists.parent!!.path) val visitLineNumber = parent.visitLineNumber(iv, start, sourceLineNumber, rangeForMapping.parent!!.name, rangeForMapping.parent!!.path)
if (visitLineNumber > 0) { if (visitLineNumber > 0) {
visited.put(lineNumber, visitLineNumber) visitedLines.put(lineNumber, visitLineNumber)
} }
lastVisitedRange = rangeForMapping
} }
} }