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

Remove compatibility hack

Browse Source
This commit is contained in:
Mikhail Bogdanov
2020-06-02 20:28:30 +02:00
parent c023a02884
commit 4f8ad6bdcb
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
+4 -10
View File
@@ -66,16 +66,10 @@ class SourceMapCopier(val parent: SourceMapper, private val smap: SMAP, val call
return mappedLineNumber return mappedLineNumber
} }
val newLineNumber = if (lineNumber == 65100) { val range = lastVisitedRange?.takeIf { lineNumber in it } ?: smap.findRange(lineNumber) ?: return -1
// TODO This is a compatibility hack for reading bytecode generated by 1.4-M1. Once the bootstrap lastVisitedRange = range
// compiler is updated to a newer version, it can be removed (as newer bytecode explicitly lists val newLineNumber = parent.mapLineNumber(range.mapDestToSource(lineNumber), callSite ?: range.callSite)
// this range in the SMAP).
parent.mapSyntheticLineNumber(InlineOnlySmapSkipper.LOCAL_VARIABLE_INLINE_ARGUMENT_SYNTHETIC_LINE_NUMBER)
} else {
val range = lastVisitedRange?.takeIf { lineNumber in it } ?: smap.findRange(lineNumber) ?: return -1
lastVisitedRange = range
parent.mapLineNumber(range.mapDestToSource(lineNumber), callSite ?: range.callSite)
}
visitedLines.put(lineNumber, newLineNumber) visitedLines.put(lineNumber, newLineNumber)
return newLineNumber return newLineNumber
} }