JVM: preserve call site markers when inlining lambdas

and default functions into their own stubs.

Fixes #KT-35006

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenForDefaultBody.kt

@@ -42,7 +42,7 @@ class InlineCodegenForDefaultBody(
         val nodeAndSmap = InlineCodegen.createInlineMethodNode(
             function, methodOwner, jvmSignature, callDefault, null, codegen.typeSystem, state, sourceCompilerForInline
         )
-        val childSourceMapper = NestedSourceMapper(sourceMapper, nodeAndSmap.classSMAP)
+        val childSourceMapper = NestedSourceMapper(sourceMapper, nodeAndSmap.classSMAP, sameFile = true)
 
         val node = nodeAndSmap.node
         val transformedMethod = MethodNode(

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.kt

@@ -285,10 +285,8 @@ class MethodInliner(
                     val childSourceMapper =
                         if (inliningContext.classRegeneration && !inliningContext.isInliningLambda)
                             NestedSourceMapper(sourceMapper, lambdaSMAP)
-                        else if (info is DefaultLambda)
-                            NestedSourceMapper(sourceMapper.parent!!, lambdaSMAP)
                         else
-                            SameFileNestedSourceMapper(sourceMapper.parent!!, info.node.classSMAP)
+                            NestedSourceMapper(sourceMapper.parent!!, lambdaSMAP, sameFile = info !is DefaultLambda)
 
                     val inliner = MethodInliner(
                         info.node.node, lambdaParameters, inliningContext.subInlineLambda(info),

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt

@@ -85,8 +85,8 @@ class SMAPBuilder(
     }
 }
 
-open class NestedSourceMapper(
+class NestedSourceMapper(
-    override val parent: SourceMapper, protected val smap: SMAP
+    override val parent: SourceMapper, private val smap: SMAP, private val sameFile: Boolean = false
 ) : DefaultSourceMapper(smap.sourceInfo) {
 
     private val visitedLines = TIntIntHashMap()
@@ -98,32 +98,29 @@ open class NestedSourceMapper(
             return lineNumber
         }
 
-        val mappedLineNumber = visitedLines.get(lineNumber)
+        if (sameFile && lineNumber <= smap.sourceInfo.linesInFile) {
-
-        return if (mappedLineNumber > 0) {
-            mappedLineNumber
-        } else {
-            val rangeForMapping =
-                (if (lastVisitedRange?.contains(lineNumber) == true) lastVisitedRange!! else smap.findRange(lineNumber))
-                    ?: error("Can't find range to map line $lineNumber in ${sourceInfo.source}: ${sourceInfo.pathOrCleanFQN}")
-            val sourceLineNumber = rangeForMapping.mapDestToSource(lineNumber)
-            val newLineNumber = parent.mapLineNumber(sourceLineNumber, rangeForMapping.parent!!.name, rangeForMapping.parent!!.path)
-            if (newLineNumber > 0) {
-                visitedLines.put(lineNumber, newLineNumber)
-            }
-            lastVisitedRange = rangeForMapping
-            newLineNumber
-        }
-    }
-}
-
-open class SameFileNestedSourceMapper(parent: SourceMapper, smap: SMAP) : NestedSourceMapper(parent, smap) {
-    override fun mapLineNumber(lineNumber: Int): Int {
-        if (lineNumber <= smap.sourceInfo.linesInFile) {
             // assuming the parent source mapper is for the same file, this line number does not need remapping
             return lineNumber
         }
-        return super.mapLineNumber(lineNumber)
+
+        val mappedLineNumber = visitedLines.get(lineNumber)
+        if (mappedLineNumber > 0) {
+            return mappedLineNumber
+        }
+
+        val range = lastVisitedRange?.takeIf { lineNumber in it }
+            ?: smap.findRange(lineNumber)
+            ?: error("Can't find range to map line $lineNumber in ${sourceInfo.source}: ${sourceInfo.pathOrCleanFQN}")
+        val sourceLineNumber = range.mapDestToSource(lineNumber)
+        val newLineNumber = if (sameFile)
+            parent.mapLineNumber(sourceLineNumber, range.parent!!.name, range.parent!!.path, range.callSiteMarker)
+        else
+            parent.mapLineNumber(sourceLineNumber, range.parent!!.name, range.parent!!.path)
+        if (newLineNumber > 0) {
+            visitedLines.put(lineNumber, newLineNumber)
+        }
+        lastVisitedRange = range
+        return newLineNumber
     }
 }
 
@@ -132,13 +129,12 @@ interface SourceMapper {
     val parent: SourceMapper?
         get() = null
 
-    fun mapLineNumber(lineNumber: Int): Int {
+    fun mapLineNumber(lineNumber: Int): Int
-        throw UnsupportedOperationException("fail")
-    }
 
-    fun mapLineNumber(source: Int, sourceName: String, sourcePath: String): Int {
+    fun mapLineNumber(source: Int, sourceName: String, sourcePath: String): Int =
-        throw UnsupportedOperationException("fail")
+        mapLineNumber(source, sourceName, sourcePath, null)
-    }
+
+    fun mapLineNumber(source: Int, sourceName: String, sourcePath: String, callSiteMarker: CallSiteMarker?): Int
 
     fun endMapping() {
     }
@@ -159,13 +155,12 @@ object IdenticalSourceMapper : SourceMapper {
 
     override fun mapLineNumber(lineNumber: Int) = lineNumber
 
-    override fun mapLineNumber(source: Int, sourceName: String, sourcePath: String): Int {
+    override fun mapLineNumber(source: Int, sourceName: String, sourcePath: String, callSiteMarker: CallSiteMarker?): Int =
         throw UnsupportedOperationException(
             "IdenticalSourceMapper#mapLineNumber($source, $sourceName, $sourcePath)\n"
                     + "This mapper should not encounter a line number out of range of the current file.\n"
                     + "This indicates that SMAP generation is missed somewhere."
         )
-    }
 }
 
 data class CallSiteMarker(val lineNumber: Int)
@@ -209,7 +204,10 @@ open class DefaultSourceMapper(val sourceInfo: SourceInfo) : SourceMapper {
         return lineNumber
     }
 
-    override fun mapLineNumber(source: Int, sourceName: String, sourcePath: String): Int {
+    override fun mapLineNumber(source: Int, sourceName: String, sourcePath: String): Int =
+        mapLineNumber(source, sourceName, sourcePath, callSiteMarker)
+
+    override fun mapLineNumber(source: Int, sourceName: String, sourcePath: String, callSiteMarker: CallSiteMarker?): Int {
         if (source < 0) {
             //no source information, so just skip this linenumber
             return -1

compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt

@@ -0,0 +1,63 @@
+// FILE: 1.kt
+// IGNORE_BACKEND_MULTI_MODULE: JVM_IR
+package test
+inline fun inlineFun2(param: String): String {
+    return param
+}
+
+inline fun inlineFun(param: String = "OK"): String {
+    // The Kotlin stratum should only contain 1 out-of-range line, and
+    // KotlinDebug should point it to this line:
+    return inlineFun2(param)
+}
+
+// FILE: 2.kt
+import test.*
+
+fun box(): String {
+    return inlineFun()
+}
+
+// FILE: 1.smap
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt
+*L
+1#1,14:1
+5#1:15
+*E
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt
+*L
+11#1:15
+*E
+
+// FILE: 2.smap
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,8:1
+8#2,4:9
+5#2:13
+*E
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+5#1,4:9
+5#1:13
+*E

compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.kt

@@ -102,7 +102,7 @@ test/_1Kt$lParams$1
 + 1 2.kt
 _2Kt
 *L
-5#1,5:11
+6#1,5:11
-5#1:17
+6#1:17
-5#1:16
+6#1:16
 *E

compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.kt

@@ -140,9 +140,9 @@ test/_1Kt$lParams$1
 + 1 2.kt
 _2Kt
 *L
-5#1:11
+6#1:11
-5#1,2:12
+6#1,2:12
-5#1:15
+6#1:15
-5#1:14
+6#1:14
-5#1:16
+6#1:16
 *E

compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt

@@ -128,9 +128,9 @@ test/_1Kt$lParams$1
 + 1 2.kt
 _2Kt
 *L
-5#1,5:11
+6#1,5:11
-5#1:17
+6#1:17
-5#1:16
+6#1:16
 *E
 
 // FILE: 2.smap-separate-compilation
@@ -156,9 +156,9 @@ test/_1Kt$lParams$1
 + 1 2.kt
 _2Kt
 *L
-5#1,5:11
+6#1,5:11
-5#1:17
+6#1:17
-5#1:16
+6#1:16
 *E
 
 SMAP

compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.kt

@@ -90,6 +90,6 @@ test/_1Kt$lParams$1
 + 1 2.kt
 _2Kt
 *L
-5#1,5:11
+6#1,5:11
-5#1:16
+6#1:16
 *E

compiler/testData/codegen/boxInline/smap/kt35006.kt

@@ -0,0 +1,44 @@
+// FILE: 1.kt
+package test
+
+inline fun f() {}
+inline fun g(x: () -> String) = x()
+
+// FILE: 2.kt
+import test.*
+
+fun box(): String {  // KotlinDebug:
+    return g {       // 2.kt:N   -> 2.kt:5
+        f()          // 2.kt:N+1 -> 2.kt:6, NOT 2.kt:5
+        f()          // 2.kt:N+2 -> 2.kt:7, NOT 2.kt:N+1 or 2.kt:5
+        "OK"
+    }
+}
+
+// FILE: 1.smap
+
+// FILE: 2.smap
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,12:1
+5#2:13
+4#2:14
+4#2:15
+*E
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+5#1:13
+6#1:14
+7#1:15
+*E

compiler/testData/codegen/boxInline/smap/smap.kt

@@ -80,36 +80,42 @@ _2Kt
 builders/_1Kt
 *L
 1#1,25:1
-7#1,3:36
+7#1,3:33
-10#1:41
+10#1:38
-11#1,2:45
+11#1,2:42
-13#1:48
+13#1:45
-15#1:50
+15#1:47
 19#2:26
-7#2,9:27
+7#2:27
-19#2:39
+15#2:28
-7#2:40
+11#2,3:29
-15#2:42
+8#2:32
-11#2,2:43
+19#2:36
-13#2:47
+7#2:37
-8#2:49
+15#2:39
+11#2,2:40
+13#2:44
+8#2:46
 *E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-20#1,3:36
+20#1,3:33
-20#1:41
+20#1:38
-20#1,2:45
+20#1,2:42
-20#1:48
+20#1:45
-20#1:50
-9#1:26
-9#1,9:27
-20#1:39
-20#1:40
-20#1:42
-20#1,2:43
 20#1:47
-20#1:49
+9#1:26
+9#1:27
+10#1:28
+10#1,3:29
+9#1:32
+20#1:36
+20#1:37
+20#1:39
+20#1,2:40
+20#1:44
+20#1:46
 *E

compiler/testData/lineNumber/custom/functionCallWithDefault.kt

@@ -8,5 +8,5 @@ fun foo(i: Int = 1) {
 
 inline fun bar(i: Int = 1) {
 }
-
+// IGNORE_BACKEND: JVM_IR
-// 2 3 13 14 4 7 6 10 9 15
+// 2 3 13 14 4 7 6 10 9 10

compiler/testData/lineNumber/custom/inTheEndOfLambdaArgumentOfInlineCall.kt

@@ -16,4 +16,4 @@ inline fun baz() {
 
 fun nop() {}
 
-// 2 20 21 3 4 25 26 5 22 6 9 10 11 14 15 17
+// 2 20 21 3 4 22 23 5 24 6 9 10 11 14 15 17

compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxInlineCodegenTestGenerated.java

@@ -3280,6 +3280,11 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
             runTest("compiler/testData/codegen/boxInline/smap/defaultFunction.kt");
         }
 
+        @TestMetadata("defaultFunctionWithInlineCall.kt")
+        public void testDefaultFunctionWithInlineCall() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt");
+        }
+
         @TestMetadata("interleavedFiles.kt")
         public void testInterleavedFiles() throws Exception {
             runTest("compiler/testData/codegen/boxInline/smap/interleavedFiles.kt");
@@ -3300,6 +3305,11 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
             runTest("compiler/testData/codegen/boxInline/smap/kt23369_3.kt");
         }
 
+        @TestMetadata("kt35006.kt")
+        public void testKt35006() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/smap/kt35006.kt");
+        }
+
         @TestMetadata("oneFile.kt")
         public void testOneFile() throws Exception {
             runTest("compiler/testData/codegen/boxInline/smap/oneFile.kt");

compiler/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java

@@ -3280,6 +3280,11 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
             runTest("compiler/testData/codegen/boxInline/smap/defaultFunction.kt");
         }
 
+        @TestMetadata("defaultFunctionWithInlineCall.kt")
+        public void testDefaultFunctionWithInlineCall() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt");
+        }
+
         @TestMetadata("interleavedFiles.kt")
         public void testInterleavedFiles() throws Exception {
             runTest("compiler/testData/codegen/boxInline/smap/interleavedFiles.kt");
@@ -3300,6 +3305,11 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
             runTest("compiler/testData/codegen/boxInline/smap/kt23369_3.kt");
         }
 
+        @TestMetadata("kt35006.kt")
+        public void testKt35006() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/smap/kt35006.kt");
+        }
+
         @TestMetadata("oneFile.kt")
         public void testOneFile() throws Exception {
             runTest("compiler/testData/codegen/boxInline/smap/oneFile.kt");

compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java

@@ -3280,6 +3280,11 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli
             runTest("compiler/testData/codegen/boxInline/smap/defaultFunction.kt");
         }
 
+        @TestMetadata("defaultFunctionWithInlineCall.kt")
+        public void testDefaultFunctionWithInlineCall() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt");
+        }
+
         @TestMetadata("interleavedFiles.kt")
         public void testInterleavedFiles() throws Exception {
             runTest("compiler/testData/codegen/boxInline/smap/interleavedFiles.kt");
@@ -3300,6 +3305,11 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli
             runTest("compiler/testData/codegen/boxInline/smap/kt23369_3.kt");
         }
 
+        @TestMetadata("kt35006.kt")
+        public void testKt35006() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/smap/kt35006.kt");
+        }
+
         @TestMetadata("oneFile.kt")
         public void testOneFile() throws Exception {
             runTest("compiler/testData/codegen/boxInline/smap/oneFile.kt");

compiler/tests/org/jetbrains/kotlin/codegen/ir/IrCompileKotlinAgainstInlineKotlinTestGenerated.java

@@ -3280,6 +3280,11 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC
             runTest("compiler/testData/codegen/boxInline/smap/defaultFunction.kt");
         }
 
+        @TestMetadata("defaultFunctionWithInlineCall.kt")
+        public void testDefaultFunctionWithInlineCall() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt");
+        }
+
         @TestMetadata("interleavedFiles.kt")
         public void testInterleavedFiles() throws Exception {
             runTest("compiler/testData/codegen/boxInline/smap/interleavedFiles.kt");
@@ -3300,6 +3305,11 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC
             runTest("compiler/testData/codegen/boxInline/smap/kt23369_3.kt");
         }
 
+        @TestMetadata("kt35006.kt")
+        public void testKt35006() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/smap/kt35006.kt");
+        }
+
         @TestMetadata("oneFile.kt")
         public void testOneFile() throws Exception {
             runTest("compiler/testData/codegen/boxInline/smap/oneFile.kt");

js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenInlineTestGenerated.java

@@ -2895,6 +2895,11 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes
             runTest("compiler/testData/codegen/boxInline/smap/defaultFunction.kt");
         }
 
+        @TestMetadata("defaultFunctionWithInlineCall.kt")
+        public void testDefaultFunctionWithInlineCall() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt");
+        }
+
         @TestMetadata("interleavedFiles.kt")
         public void testInterleavedFiles() throws Exception {
             runTest("compiler/testData/codegen/boxInline/smap/interleavedFiles.kt");
@@ -2915,6 +2920,11 @@ public class IrJsCodegenInlineTestGenerated extends AbstractIrJsCodegenInlineTes
             runTest("compiler/testData/codegen/boxInline/smap/kt23369_3.kt");
         }
 
+        @TestMetadata("kt35006.kt")
+        public void testKt35006() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/smap/kt35006.kt");
+        }
+
         @TestMetadata("oneFile.kt")
         public void testOneFile() throws Exception {
             runTest("compiler/testData/codegen/boxInline/smap/oneFile.kt");

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenInlineTestGenerated.java

@@ -2895,6 +2895,11 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest {
             runTest("compiler/testData/codegen/boxInline/smap/defaultFunction.kt");
         }
 
+        @TestMetadata("defaultFunctionWithInlineCall.kt")
+        public void testDefaultFunctionWithInlineCall() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt");
+        }
+
         @TestMetadata("interleavedFiles.kt")
         public void testInterleavedFiles() throws Exception {
             runTest("compiler/testData/codegen/boxInline/smap/interleavedFiles.kt");
@@ -2915,6 +2920,11 @@ public class JsCodegenInlineTestGenerated extends AbstractJsCodegenInlineTest {
             runTest("compiler/testData/codegen/boxInline/smap/kt23369_3.kt");
         }
 
+        @TestMetadata("kt35006.kt")
+        public void testKt35006() throws Exception {
+            runTest("compiler/testData/codegen/boxInline/smap/kt35006.kt");
+        }
+
         @TestMetadata("oneFile.kt")
         public void testOneFile() throws Exception {
             runTest("compiler/testData/codegen/boxInline/smap/oneFile.kt");