New source mapping

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

@@ -0,0 +1,46 @@
+// FILE: 1.kt
+
+package test
+
+inline fun test(s: () -> Unit) {
+    val z = 1;
+    s()
+    val x = 1;
+}
+
+
+// FILE: 2.kt
+
+import test.*
+
+fun box(): String {
+    var result = "fail"
+    test {
+        result = "O"
+    }
+
+    test {
+        result += "K"
+    }
+
+    return result
+}
+
+// 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,18:1
+6#2,4:19
+6#2,4:23
+*E

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

@@ -0,0 +1,79 @@
+// FILE: 1.kt
+
+package test
+
+inline fun myrun(s: () -> Unit) {
+    val z = "myrun"
+    s()
+}
+
+inline fun test(crossinline s: () -> Unit) {
+    {
+        val z = 1;
+        myrun(s)
+        val x = 1;
+    }()
+}
+
+// FILE: 2.kt
+
+import test.*
+
+fun box(): String {
+    var result = "fail"
+
+    test {
+        result = "OK"
+    }
+
+    return result
+}
+
+
+// FILE: 1.smap
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$test$1
++ 2 1.kt
+test/_1Kt
+*L
+1#1,18:1
+6#2,3:19
+*E
+
+// FILE: 2.smap
+
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,16:1
+11#2,6:17
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$test$1
++ 2 1.kt
+test/_1Kt
++ 3 2.kt
+_2Kt
+*L
+1#1,18:1
+6#2,3:19
+9#3,2:22
+*E

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

@@ -0,0 +1,66 @@
+// FILE: 1.kt
+
+package test
+
+inline fun test(s: () -> Unit) {
+    val z = 1;
+    s()
+    val x = 1;
+}
+
+inline fun test2(s: () -> String): String {
+    val z = 1;
+    val res = s()
+    return res
+}
+
+// FILE: 2.kt
+
+import test.*
+
+fun box(): String {
+    var result = "fail"
+
+    test {
+        {
+            result = test2 {
+                "OK"
+            }
+        }()
+    }
+
+    return result
+}
+
+
+// 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,20:1
+6#2,4:21
+*E
+
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt$box$1$1
++ 2 1.kt
+test/_1Kt
+*L
+1#1,20:1
+12#2,3:21
+*E

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

@@ -0,0 +1,66 @@
+// FILE: 1.kt
+
+package test
+
+inline fun test(s: () -> Unit) {
+    val z = 1;
+    s()
+    val x = 1;
+}
+
+// FILE: 2.kt
+
+import test.*
+
+inline fun test2(s: () -> String): String {
+    val z = 1;
+    val res = s()
+    return res
+}
+
+fun box(): String {
+    var result = "fail"
+
+    test {
+        {
+            result = test2 {
+                "OK"
+            }
+        }()
+    }
+
+    return result
+}
+
+
+// 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,26:1
+6#2,4:27
+*E
+
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt$box$1$1
++ 2 2.kt
+_2Kt
+*L
+1#1,26:1
+6#2,3:27
+*E