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

JVM: fix SMAP range extension logic

Browse Source 
If `mapLineNumber` was called in non-monotonic order, e.g. N then N+2
then N+1, the first two calls created a range that spans [N; N+2] but
the third call did not reuse it.
This commit is contained in:
pyos
2020-03-25 14:45:37 +01:00
committed by max-kammerer
parent b4d7dfd02c
commit 9d21800d8f
25 changed files with 284 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
+20 -59
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.codegen.inline
import gnu.trove.TIntIntHashMap
import org.jetbrains.kotlin.codegen.ClassBuilder
import org.jetbrains.kotlin.codegen.SourceInfo
import org.jetbrains.kotlin.codegen.inline.SMAP.Companion.END
import org.jetbrains.kotlin.codegen.inline.SMAP.Companion.FILE_SECTION
@@ -169,35 +168,25 @@ object IdenticalSourceMapper : SourceMapper {
}
}
class CallSiteMarker(val lineNumber: Int)
data class CallSiteMarker(val lineNumber: Int)
open class DefaultSourceMapper(val sourceInfo: SourceInfo) : SourceMapper {
private var maxUsedValue: Int = sourceInfo.linesInFile
private var lastMappedWithChanges: RawFileMapping? = null
private var fileMappings: LinkedHashMap<String, RawFileMapping> = linkedMapOf()
protected val origin: RawFileMapping
private var fileMappings: LinkedHashMap<Pair<String, String>, RawFileMapping> = linkedMapOf()
var callSiteMarker: CallSiteMarker? = null
set(value) {
lastMappedWithChanges = null
field = value
}
override val resultMappings: List<FileMapping>
get() = fileMappings.values.map { it.toFileMapping() }
init {
val name = sourceInfo.source
val path = sourceInfo.pathOrCleanFQN
origin = RawFileMapping(name, path)
origin.initRange(1, sourceInfo.linesInFile)
fileMappings.put(createKey(name, path), origin)
// Explicitly map the file to itself.
getOrRegisterNewSource(sourceInfo.source, sourceInfo.pathOrCleanFQN).mapNewInterval(1, 1, sourceInfo.linesInFile)
}
constructor(sourceInfo: SourceInfo, fileMappings: List<FileMapping>) : this(sourceInfo) {
// The first mapping is already created in the `init` block above.
fileMappings.asSequence().drop(1)
//default one mapped through sourceInfo
.forEach { fileMapping ->
val newFileMapping = getOrRegisterNewSource(fileMapping.name, fileMapping.path)
fileMapping.lineMappings.forEach {
@@ -207,10 +196,8 @@ open class DefaultSourceMapper(val sourceInfo: SourceInfo) : SourceMapper {
}
}
private fun createKey(name: String, path: String) = "$name#$path"
private fun getOrRegisterNewSource(name: String, path: String): RawFileMapping {
return fileMappings.getOrPut(createKey(name, path)) { RawFileMapping(name, path) }
return fileMappings.getOrPut(name to path) { RawFileMapping(name, path) }
}
override fun mapLineNumber(lineNumber: Int): Int {
@@ -227,15 +214,9 @@ open class DefaultSourceMapper(val sourceInfo: SourceInfo) : SourceMapper {
//no source information, so just skip this linenumber
return -1
}
return createMapping(getOrRegisterNewSource(sourceName, sourcePath), source)
}
private fun createMapping(fileMapping: RawFileMapping, lineNumber: Int): Int {
val mappedLineIndex = fileMapping.mapNewLineNumber(lineNumber, maxUsedValue, lastMappedWithChanges == fileMapping, callSiteMarker)
if (mappedLineIndex > maxUsedValue) {
lastMappedWithChanges = fileMapping
maxUsedValue = mappedLineIndex
}
val fileMapping = getOrRegisterNewSource(sourceName, sourcePath)
val mappedLineIndex = fileMapping.mapNewLineNumber(source, maxUsedValue, callSiteMarker)
maxUsedValue = max(maxUsedValue, mappedLineIndex)
return mappedLineIndex
}
}
@@ -270,8 +251,6 @@ data class SMAPAndMethodNode(val node: MethodNode, val classSMAP: SMAP)
class RawFileMapping(val name: String, val path: String) {
private val rangeMappings = arrayListOf<RangeMapping>()
private var lastMappedWithNewIndex = -1000
fun toFileMapping() =
FileMapping(name, path).apply {
for (range in rangeMappings) {
@@ -279,39 +258,21 @@ class RawFileMapping(val name: String, val path: String) {
}
}
fun initRange(start: Int, end: Int) {
assert(rangeMappings.isEmpty()) { "initRange should only be called for empty mapping" }
rangeMappings.add(RangeMapping(start, start, end - start + 1))
lastMappedWithNewIndex = end
}
fun mapNewLineNumber(source: Int, currentIndex: Int, isLastMapped: Boolean, callSiteMarker: CallSiteMarker?): Int {
val dest: Int
val rangeMapping: RangeMapping
if (rangeMappings.isNotEmpty() && isLastMapped && couldFoldInRange(lastMappedWithNewIndex, source)) {
rangeMapping = rangeMappings.last()
rangeMapping.range += source - lastMappedWithNewIndex
dest = rangeMapping.mapSourceToDest(source)
fun mapNewLineNumber(source: Int, currentIndex: Int, callSiteMarker: CallSiteMarker?): Int {
var mapping = rangeMappings.lastOrNull()
if (mapping != null && mapping.callSiteMarker == callSiteMarker &&
(source - mapping.source) in 0 until mapping.range + (if (mapping.maxDest == currentIndex) 10 else 0)
) {
// Save some space in the SMAP by reusing (or extending if it's the last one) the existing range.
mapping.range = max(mapping.range, source - mapping.source + 1)
} else {
dest = currentIndex + 1
rangeMapping = RangeMapping(source, dest, callSiteMarker = callSiteMarker)
rangeMappings.add(rangeMapping)
mapping = mapNewInterval(source, currentIndex + 1, 1, callSiteMarker)
}
lastMappedWithNewIndex = source
return dest
return mapping.mapSourceToDest(source)
}
fun mapNewInterval(source: Int, dest: Int, range: Int) {
val rangeMapping = RangeMapping(source, dest, range)
rangeMappings.add(rangeMapping)
}
private fun couldFoldInRange(first: Int, second: Int): Boolean {
//TODO
val delta = second - first
return delta > 0 && delta <= 10
}
fun mapNewInterval(source: Int, dest: Int, range: Int, callSiteMarker: CallSiteMarker? = null): RangeMapping =
RangeMapping(source, dest, range, callSiteMarker).also { rangeMappings.add(it) }
}
open class FileMapping(val name: String, val path: String) {
compiler/testData/codegen/boxInline/smap/assertion.kt
Vendored
-1
View File
@@ -47,7 +47,6 @@ Kotlin
test/_1Kt
*L
1#1,26:1
19#1,6:27
*E
// FILE: 2.smap
compiler/testData/codegen/boxInline/smap/defaultFunction.kt
Vendored
-1
View File
@@ -25,7 +25,6 @@ Kotlin
test/_1Kt
*L
1#1,9:1
6#1:10
*E
SMAP
compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt
Vendored
-1
View File
@@ -53,7 +53,6 @@ Kotlin
test/_1Kt
*L
1#1,39:1
35#1,2:40
*E
SMAP
compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.kt
Vendored
-1
View File
@@ -55,7 +55,6 @@ Kotlin
test/_1Kt
*L
1#1,39:1
35#1,2:40
*E
SMAP
compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.kt
Vendored
-1
View File
@@ -91,7 +91,6 @@ Kotlin
test/_1Kt
*L
1#1,75:1
71#1,2:76
*E
SMAP
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt
Vendored
-1
View File
@@ -54,7 +54,6 @@ Kotlin
test/_1Kt
*L
1#1,40:1
36#1,2:41
*E
SMAP
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt
Vendored
-1
View File
@@ -56,7 +56,6 @@ Kotlin
test/_1Kt
*L
1#1,40:1
36#1,2:41
*E
SMAP
compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.kt
Vendored
-1
View File
@@ -54,7 +54,6 @@ Kotlin
test/_1Kt
*L
1#1,38:1
34#1,2:39
*E
SMAP
compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt
Vendored
-1
View File
@@ -29,7 +29,6 @@ Kotlin
test/_1Kt
*L
1#1,13:1
8#1:14
*E
SMAP
compiler/testData/codegen/boxInline/smap/defaultLambda/simple.kt
Vendored
-1
View File
@@ -27,7 +27,6 @@ Kotlin
test/_1Kt
*L
1#1,11:1
8#1:12
*E
SMAP
compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.kt
Vendored
-1
View File
@@ -52,7 +52,6 @@ Kotlin
test/_1Kt
*L
1#1,38:1
34#1,2:39
*E
SMAP
compiler/testData/codegen/boxInline/smap/interleavedFiles.kt
Vendored
+2 -6
View File
@@ -36,12 +36,10 @@ test/_1Kt
4#1:19
7#1:21
8#1:23
4#1,6:24
10#1:31
4#1,7:24
4#2:18
4#2:20
4#2:22
4#2:30
*E
*S KotlinDebug
*F
@@ -51,10 +49,8 @@ _2Kt
8#1:19
13#1:21
13#1:23
13#1,6:24
13#1:31
13#1,7:24
7#1:18
9#1:20
13#1:22
13#1:30
*E
compiler/testData/codegen/boxInline/smap/rangeFolding.kt
Vendored
+76
View File
@@ -0,0 +1,76 @@
// FILE: 1.kt
package test
inline fun f() {}
inline fun g() {}
inline fun h() {}
inline fun together() {
f() // new range 1.kt:N -> 1.kt:4
h() // new range 1.kt:N+1 -> 1.kt:6 because of different call site
g() // new range 1.kt:N+2 -> 1.kt:5 for the same reason
}
// FILE: 2.kt
import test.*
fun box(): String {
// 1. new range 2.kt:N -> 1.kt:9
// 2. new range 2.kt:N+1 -> 1.kt:4
// 3. extend to 2.kt:N+1..N+7 -> 1.kt:4..10 and use N+7 for 1.kt:10
// 4. use N+2 for 1.kt:5
// 5. extend to 2.kt:N+1..N+8 -> 1.kt:4..11 and use N+8 for 1.kt:11
// 6. use N+3 for 1.kt:6
// 7. extend to 2.kt:N+1..N+9 -> 1.kt:4..12 and use N+9 for 1.kt:12
// steps 4 and 6 *should not* create new ranges
together()
return "OK"
}
// FILE: 1.smap
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt
*L
1#1,14:1
4#1:15
6#1:16
5#1:17
*E
*S KotlinDebug
*F
+ 1 1.kt
test/_1Kt
*L
9#1:15
10#1:16
11#1:17
*E
// FILE: 2.smap
SMAP
2.kt
Kotlin
*S Kotlin
*F
+ 1 2.kt
_2Kt
+ 2 1.kt
test/_1Kt
*L
1#1,17:1
9#2:18
4#2,9:19
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
13#1:18
13#1,9:19
*E
compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt
Vendored
+100
View File
@@ -0,0 +1,100 @@
// FILE: 1.kt
package test
object A { inline fun f() {} }
object B { inline fun g() {} }
object C { inline fun h() {} }
object D {
inline fun together() {
A.f()
C.h()
B.g()
}
}
// FILE: 2.kt
import test.*
object X {
// Unlike `rangeFolding.kt`, the calls in `D.together` refer to different
// classes which are reflected in the SMAP, so they cannot be joined into
// a single range even in `X.foo`; neither can lines corresponding to
// `D.together` because they do not form an uninterrupted range.
fun foo() = D.together()
}
fun box(): String {
X.foo()
return "OK"
}
// FILE: 1.smap
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/D
+ 2 1.kt
test/A
+ 3 1.kt
test/C
+ 4 1.kt
test/B
*L
1#1,16:1
4#2:17
6#3:18
5#4:19
*E
*S KotlinDebug
*F
+ 1 1.kt
test/D
*L
10#1:17
11#1:18
12#1:19
*E
// FILE: 2.smap
SMAP
2.kt
Kotlin
*S Kotlin
*F
+ 1 2.kt
X
+ 2 1.kt
test/D
+ 3 1.kt
test/A
+ 4 1.kt
test/C
+ 5 1.kt
test/B
*L
1#1,17:1
10#2:18
11#2:20
12#2:22
13#2:24
4#3:19
6#4:21
5#5:23
*E
*S KotlinDebug
*F
+ 1 2.kt
X
*L
9#1:18
9#1:20
9#1:22
9#1:24
9#1:19
9#1:21
9#1:23
*E
compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt
Vendored
+2 -4
View File
@@ -33,14 +33,12 @@ _2Kt
zzz/_1Kt
*L
1#1,11:1
7#2:12
9#2:13
7#2,3:12
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
6#1:12
6#1:13
6#1,3:12
*E
compiler/testData/codegen/boxInline/smap/smap.kt
Vendored
+22 -26
View File
@@ -80,40 +80,36 @@ _2Kt
builders/_1Kt
*L
1#1,25:1
7#1,3:40
10#1:45
11#1,2:49
13#1:52
15#1:54
7#1,3:36
10#1:41
11#1,2:45
13#1:48
15#1:50
19#2:26
7#2,9:27
11#2,3:36
8#2:39
19#2:43
7#2:44
15#2:46
11#2,2:47
13#2:51
8#2:53
19#2:39
7#2:40
15#2:42
11#2,2:43
13#2:47
8#2:49
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
20#1,3:40
20#1:45
20#1,2:49
20#1:52
20#1:54
20#1,3:36
20#1:41
20#1,2:45
20#1:48
20#1:50
9#1:26
9#1,9:27
9#1,3:36
9#1:39
20#1:43
20#1:44
20#1:46
20#1,2:47
20#1:51
20#1:53
20#1:39
20#1:40
20#1:42
20#1,2:43
20#1:47
20#1:49
*E
compiler/testData/lineNumber/custom/inTheEndOfLambdaArgumentOfInlineCall.kt
Vendored
+1 -1
View File
@@ -16,4 +16,4 @@ inline fun baz() {
fun nop() {}
// 2 20 21 3 4 25 26 5 27 6 9 10 11 14 15 17
// 2 20 21 3 4 25 26 5 22 6 9 10 11 14 15 17
compiler/testData/lineNumber/custom/smapInlineAsInlineArgument.kt
Vendored
+1 -1
View File
@@ -18,4 +18,4 @@ fun fail() : String {
throw AssertionError("fail")
}
// 2 22 3 2 23 5 6 24 5 25 7 10 14 18
// 2 22 3 2 22 5 6 23 5 24 7 10 14 18
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java
Generated
+10
View File
@@ -3305,6 +3305,16 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
runTest("compiler/testData/codegen/boxInline/smap/oneFile.kt");
}
@TestMetadata("rangeFolding.kt")
public void testRangeFolding() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/rangeFolding.kt");
}
@TestMetadata("rangeFoldingInClass.kt")
public void testRangeFoldingInClass() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt");
}
@TestMetadata("smap.kt")
public void testSmap() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/smap.kt");
compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java
Generated
+10
View File
@@ -3305,6 +3305,16 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
runTest("compiler/testData/codegen/boxInline/smap/oneFile.kt");
}
@TestMetadata("rangeFolding.kt")
public void testRangeFolding() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/rangeFolding.kt");
}
@TestMetadata("rangeFoldingInClass.kt")
public void testRangeFoldingInClass() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt");
}
@TestMetadata("smap.kt")
public void testSmap() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/smap.kt");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java
Generated
+10
View File
@@ -3305,6 +3305,16 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli
runTest("compiler/testData/codegen/boxInline/smap/oneFile.kt");
}
@TestMetadata("rangeFolding.kt")
public void testRangeFolding() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/rangeFolding.kt");
}
@TestMetadata("rangeFoldingInClass.kt")
public void testRangeFoldingInClass() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt");
}
@TestMetadata("smap.kt")
public void testSmap() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/smap.kt");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java
Generated
+10
View File
@@ -3305,6 +3305,16 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC
runTest("compiler/testData/codegen/boxInline/smap/oneFile.kt");
}
@TestMetadata("rangeFolding.kt")
public void testRangeFolding() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/rangeFolding.kt");
}
@TestMetadata("rangeFoldingInClass.kt")
public void testRangeFoldingInClass() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt");
}
@TestMetadata("smap.kt")
public void testSmap() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/smap.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java
Generated
+10
View File
@@ -2920,6 +2920,16 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes
runTest("compiler/testData/codegen/boxInline/smap/oneFile.kt");
}
@TestMetadata("rangeFolding.kt")
public void testRangeFolding() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/rangeFolding.kt");
}
@TestMetadata("rangeFoldingInClass.kt")
public void testRangeFoldingInClass() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt");
}
@TestMetadata("smap.kt")
public void testSmap() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/smap.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java
Generated
+10
View File
@@ -2920,6 +2920,16 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest {
runTest("compiler/testData/codegen/boxInline/smap/oneFile.kt");
}
@TestMetadata("rangeFolding.kt")
public void testRangeFolding() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/rangeFolding.kt");
}
@TestMetadata("rangeFoldingInClass.kt")
public void testRangeFoldingInClass() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt");
}
@TestMetadata("smap.kt")
public void testSmap() throws Exception {
runTest("compiler/testData/codegen/boxInline/smap/smap.kt");