[Test] Enable SMAP dump handler in boxInline tests

compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.kt

@@ -33,45 +33,3 @@ fun box(): String {
     return z;
 }
 
-// SMAP_FILE: 1.smap
-
-// SMAP_FILE: 2.smap
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/B
-*L
-1#1,19:1
-13#2,2:20
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-9#1:20,2
-*E
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt$box$1$1
-+ 2 1.kt
-test/A
-*L
-1#1,19:1
-7#2,2:20
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt$box$1$1
-*L
-11#1:20,2
-*E

compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.smap

@@ -0,0 +1,43 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/B
+*L
+1#1,36:1
+15#2,2:37
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+26#1:37,2
+*E
+
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt$box$1$1
++ 2 1.kt
+test/A
+*L
+1#1,36:1
+9#2,2:37
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt$box$1$1
+*L
+28#1:37,2
+*E
+

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

@@ -27,53 +27,3 @@ fun box(): String {
 
     return result
 }
-
-
-// SMAP_FILE: 1.smap
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/Introspector$SchemaRetriever$inSchema$1
-*L
-1#1,12:1
-*E
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-IntrospectorImpl$SchemaRetriever
-+ 2 1.kt
-test/Introspector$SchemaRetriever
-*L
-1#1,21:1
-8#2:22
-*S KotlinDebug
-*F
-+ 1 2.kt
-IntrospectorImpl$SchemaRetriever
-*L
-9#1:22
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/Introspector$SchemaRetriever$inSchema$1
-+ 2 2.kt
-IntrospectorImpl$SchemaRetriever
-*L
-1#1,12:1
-9#2:13
-*E

compiler/testData/codegen/boxInline/smap/anonymous/kt19175.smap

@@ -0,0 +1,47 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/Introspector$SchemaRetriever$inSchema$1
+*L
+1#1,12:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+IntrospectorImpl$SchemaRetriever
++ 2 1.kt
+test/Introspector$SchemaRetriever
+*L
+1#1,30:1
+8#2:31
+*S KotlinDebug
+*F
++ 1 2.kt
+IntrospectorImpl$SchemaRetriever
+*L
+20#1:31
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/Introspector$SchemaRetriever$inSchema$1
++ 2 2.kt
+IntrospectorImpl$SchemaRetriever
+*L
+1#1,12:1
+20#2:13
+*E
+

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

@@ -28,52 +28,3 @@ fun test(): String {
 fun box(): String {
     return test()
 }
-
-// SMAP_FILE: 1.smap
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-builders/_1Kt$call$1
-*L
-1#1,12:1
-*E
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-builders/_1Kt
-*L
-1#1,21:1
-7#2:22
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-9#1:22
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-builders/_1Kt$call$1
-+ 2 2.kt
-_2Kt
-*L
-1#1,12:1
-10#2,2:13
-*E

compiler/testData/codegen/boxInline/smap/anonymous/lambda.smap

@@ -0,0 +1,47 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+builders/_1Kt$call$1
+*L
+1#1,13:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+builders/_1Kt
+*L
+1#1,31:1
+8#2:32
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+20#1:32
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+builders/_1Kt$call$1
++ 2 2.kt
+_2Kt
+*L
+1#1,13:1
+21#2,2:14
+*E
+

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

@@ -29,27 +29,3 @@ fun test(): String {
 fun box(): String {
     return test()
 }
-
-// SMAP_FILE: 1.smap
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-builders/_1Kt
-*L
-1#1,23:1
-7#2:24
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-9#1:24
-*E

compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.smap

@@ -0,0 +1,23 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+builders/_1Kt
+*L
+1#1,32:1
+8#2:33
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+19#1:33
+*E
+

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

@@ -1,4 +1,7 @@
+// IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
 // NO_CHECK_LAMBDA_INLINING
+// IGNORE_BACKEND: JVM_IR
+// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: 1.kt
 package builders
 inline fun call(crossinline init: () -> Unit) {
@@ -26,59 +29,3 @@ inline fun test(): String {
 fun box(): String {
     return test()
 }
-
-// SMAP_FILE: 1.smap
-
-// SMAP_FILE: 2.smap
-
-//TODO
-//7#1,3:26
-//10#1,6:30 - could be merged in one big interval due preprocessing of inline function
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-builders/_1Kt
-*L
-1#1,24:1
-7#1,3:26
-10#1,6:30
-7#2:25
-7#2:29
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-20#1:26,3
-20#1:30,6
-9#1:25
-20#1:29
-*E
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt$test$1$1
-*L
-1#1,24:1
-*E
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt$test$1$1
-*L
-1#1,24:1
-*E

compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.smap

@@ -0,0 +1,51 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+builders/_1Kt
+*L
+1#1,32:1
+17#1,3:34
+20#1,6:38
+8#2:33
+8#2:37
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+30#1:34,3
+30#1:38,6
+19#1:33
+30#1:37
+*E
+
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt$test$1$1
+*L
+1#1,32:1
+*E
+
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt$test$1$1
+*L
+1#1,32:1
+*E
+

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

@@ -31,52 +31,3 @@ fun test(): String {
 fun box(): String {
     return test()
 }
-
-// SMAP_FILE: 1.smap
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-builders/_1Kt$call$1
-*L
-1#1,14:1
-*E
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-builders/_1Kt
-*L
-1#1,22:1
-7#2,5:23
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-9#1:23,5
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-builders/_1Kt$call$1
-+ 2 2.kt
-_2Kt
-*L
-1#1,14:1
-10#2,2:15
-*E

compiler/testData/codegen/boxInline/smap/anonymous/object.smap

@@ -0,0 +1,47 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+builders/_1Kt$call$1
+*L
+1#1,15:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+builders/_1Kt
+*L
+1#1,34:1
+8#2,5:35
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+23#1:35,5
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+builders/_1Kt$call$1
++ 2 2.kt
+_2Kt
+*L
+1#1,15:1
+24#2,2:16
+*E
+

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

@@ -31,28 +31,3 @@ fun test(): String {
 fun box(): String {
     return test()
 }
-
-// SMAP_FILE: 1.smap
-
-// SMAP_FILE: 2.smap
-
-//SMAP
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-builders/_1Kt
-*L
-1#1,26:1
-7#2:27
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-9#1:27
-*E

compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.smap

@@ -0,0 +1,23 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+builders/_1Kt
+*L
+1#1,34:1
+8#2:35
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+19#1:35
+*E
+

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

@@ -1,3 +1,6 @@
+// IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
+// IGNORE_BACKEND: JVM_IR
+// IGNORE_BACKEND_FIR: JVM_IR
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 package builders
@@ -28,58 +31,3 @@ inline fun test(): String {
 fun box(): String {
     return test()
 }
-
-// SMAP_FILE: 1.smap
-
-// SMAP_FILE: 2.smap
-
-//7#1,3:28
-//10#1,8:32 - could be merged in one big interval due preprocessing of inline function
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-builders/_1Kt
-*L
-1#1,26:1
-7#1,3:28
-10#1,8:32
-7#2:27
-7#2:31
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-22#1:28,3
-22#1:32,8
-9#1:27
-22#1:31
-*E
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt$test$1$1
-*L
-1#1,26:1
-*E
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt$test$1$1
-*L
-1#1,26:1
-*E

compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.smap

@@ -0,0 +1,51 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+builders/_1Kt
+*L
+1#1,34:1
+17#1,3:36
+20#1,8:40
+8#2:35
+8#2:39
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+32#1:36,3
+32#1:40,8
+19#1:35
+32#1:39
+*E
+
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt$test$1$1
+*L
+1#1,34:1
+*E
+
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt$test$1$1
+*L
+1#1,34:1
+*E
+

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

@@ -1,5 +1,8 @@
+// IGNORE
 // NO_CHECK_LAMBDA_INLINING
+// IGNORE_BACKEND_MULTI_MODULE: JVM, JVM_IR, JVM_MULTI_MODULE_OLD_AGAINST_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
 // FILE: 1.kt
+// NO_SMAP_DUMP
 
 package builders
 
@@ -29,56 +32,3 @@ import builders.*
 fun box(): String {
     return test()
 }
-
-// SMAP_FILE: 1.sxmap
-
-//TODO SHOULD BE LESS
-
-SXMAP
-objectOnInlineCallSite2.2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 objectOnInlineCallSite2.2.kt
-builders/BuildersPackage
-*L
-1#1,42:1
-*E
-
-SXMAP
-objectOnInlineCallSite2.2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 objectOnInlineCallSite2.2.kt
-builders/BuildersPackage$objectOnInlineCallSite2_2$HASH$test$1$1
-*L
-1#1,42:1
-*E
-
-// SMAP_FILE: 2.sxmap
-
-SXMAP
-objectOnInlineCallSite2.1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 objectOnInlineCallSite2.1.kt
-_DefaultPackage
-+ 2 objectOnInlineCallSite2.2.kt
-builders/BuildersPackage
-*L
-1#1,32:1
-8#2,11:33
-*E
-
-SXMAP
-objectOnInlineCallSite2.2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 objectOnInlineCallSite2.2.kt
-builders/BuildersPackage$objectOnInlineCallSite2_2$HASH$test$1$1
-*L
-1#1,42:1
-*E

compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.smap

@@ -0,0 +1,23 @@
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+builders/_1Kt
+*L
+1#1,35:1
+14#2,3:36
+10#2,15:39
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+33#1:36,3
+33#1:39,15
+*E
+

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

@@ -1,6 +1,6 @@
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
-
+// NO_SMAP_DUMP
 
 package builders
 //TODO there is a bug in asm it's skips linenumber on same line on reading bytecode
@@ -21,7 +21,6 @@ inline fun test(crossinline p: () -> String): String {
 
     return res
 }
-//TODO SHOULD BE LESS
 
 // FILE: 2.kt
 
@@ -32,4 +31,3 @@ fun box(): String {
     return test{"OK"}
 }
 
-//TODO

compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.smap

@@ -0,0 +1,37 @@
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+builders/_1Kt
+*L
+1#1,34:1
+12#2,3:35
+8#2,15:38
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+31#1:35,3
+31#1:38,15
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+builders/_1Kt$test$1$1
++ 2 2.kt
+_2Kt
+*L
+1#1,25:1
+31#2:26
+*E
+

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

@@ -1,4 +1,5 @@
-//FILE: 1.kt
+// FILE: 1.kt
+// NO_SMAP_DUMP
 package test
 
 
@@ -15,7 +16,7 @@ inline fun any(s: () -> Boolean) {
 }
 
 
-//FILE: 2.kt
+// FILE: 2.kt
 import test.*
 
 fun box(): String {
@@ -31,52 +32,3 @@ inline fun test(z: () -> Unit) {
     z()
 }
 
-
-// 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
-10#2:19
-6#2:20
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-7#1:19
-7#1:20
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$annotatedWith2$1
-+ 2 1.kt
-test/_1Kt
-+ 3 2.kt
-_2Kt
-*L
-1#1,18:1
-14#2:19
-10#2:20
-15#2:22
-7#3:21
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/_1Kt$annotatedWith2$1
-*L
-6#1:19
-6#1:22
-*E

compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.smap

@@ -0,0 +1,49 @@
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,35:1
+11#2:36
+7#2:37
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+25#1:36
+25#1:37
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$annotatedWith2$1
++ 2 1.kt
+test/_1Kt
++ 3 2.kt
+_2Kt
+*L
+1#1,19:1
+15#2:20
+11#2:21
+16#2:23
+25#3:22
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt$annotatedWith2$1
+*L
+7#1:20
+7#1:23
+*E
+

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

@@ -35,29 +35,3 @@ fun box(): String {
 
     return "OK"
 }
-
-// SMAP_FILE: 1.smap
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-*L
-1#1,14:1
-18#2,7:15
-9#2,7:22
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-6#1:15,7
-7#1:22,7
-*E

compiler/testData/codegen/boxInline/smap/assertion.smap

@@ -0,0 +1,25 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,38:1
+18#2,7:39
+9#2,7:46
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+31#1:39,7
+32#1:46,7
+*E
+

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

@@ -15,81 +15,3 @@ class B {
 import test.*
 
 fun box() = A().a()
-
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/B
-+ 2 1.kt
-test/A
-*L
-1#1,14:1
-11#1:16
-6#2:15
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/B
-*L
-10#1:16
-10#1:15
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/A
-+ 2 1.kt
-test/B
-*L
-1#1,14:1
-6#1:16
-10#2:15
-11#2:17
-11#2:18
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/A
-*L
-5#1:16
-5#1:15
-5#1:17
-6#1:18
-*E
-
-// SMAP_FILE: 2.smap
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/A
-+ 3 1.kt
-test/B
-*L
-1#1,6:1
-5#2:7
-6#2:9
-10#3:8
-11#3:10
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-4#1:7
-4#1:9
-4#1:8
-4#1:10
-*E

compiler/testData/codegen/boxInline/smap/classCycle.smap

@@ -0,0 +1,78 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/B
++ 2 1.kt
+test/A
+*L
+1#1,14:1
+11#1:16
+6#2:15
+*S KotlinDebug
+*F
++ 1 1.kt
+test/B
+*L
+10#1:16
+10#1:15
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/A
++ 2 1.kt
+test/B
+*L
+1#1,14:1
+6#1:16
+10#2:15
+11#2:17
+11#2:18
+*S KotlinDebug
+*F
++ 1 1.kt
+test/A
+*L
+5#1:16
+5#1:15
+5#1:17
+6#1:18
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/A
++ 3 1.kt
+test/B
+*L
+1#1,18:1
+5#2:19
+6#2:21
+10#3:20
+11#3:22
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+17#1:19
+17#1:21
+17#1:20
+17#1:22
+*E
+

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

@@ -11,25 +11,3 @@ fun box(): String {
 
     return "OK"
 }
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-A
-*L
-1#1,9:1
-4#2:10
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-4#1:10
-*E

compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.smap

@@ -0,0 +1,23 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+A
+*L
+1#1,14:1
+4#2:15
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+10#1:15
+*E
+

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

@@ -1,5 +1,6 @@
 // This test depends on line numbers
 // WITH_RUNTIME
+// IGNORE_BACKEND_FIR: JVM_IR
 // FILE: 1.kt
 package test
 
@@ -47,87 +48,3 @@ fun box(): String {
     return res
 }
 
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineMe2$2
-*L
-1#1,23:1
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineMe1$2
-*L
-1#1,23:1
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineMe1$2$run$1
-*L
-1#1,23:1
-*E
-
-// SMAP_FILE: 2.smap
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt$box$1
-+ 2 1.kt
-test/_1Kt
-*L
-1#1,29:1
-12#2,5:30
-19#2,3:35
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt$box$1
-*L
-19#1:30,5
-22#1:35,3
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineMe2$2
-+ 2 2.kt
-_2Kt$box$1
-*L
-1#1,23:1
-23#2,2:24
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineMe1$2
-+ 2 2.kt
-_2Kt$box$1
-*L
-1#1,23:1
-20#2,2:24
-*E

compiler/testData/codegen/boxInline/smap/crossroutines.smap

@@ -0,0 +1,85 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$inlineMe2$2
+*L
+1#1,23:1
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$inlineMe1$2
+*L
+1#1,23:1
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$inlineMe1$2$run$1
+*L
+1#1,23:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt$box$1
++ 2 1.kt
+test/_1Kt
+*L
+1#1,51:1
+12#2,5:52
+19#2,3:57
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt$box$1
+*L
+41#1:52,5
+44#1:57,3
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$inlineMe2$2
++ 2 2.kt
+_2Kt$box$1
+*L
+1#1,23:1
+45#2,2:24
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$inlineMe1$2
++ 2 2.kt
+_2Kt$box$1
+*L
+1#1,23:1
+42#2,2:24
+*E
+

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

@@ -8,22 +8,10 @@ inline fun inlineFun(capturedParam: String, noinline lambda: () -> String = { ca
 }
 
 // FILE: 2.kt
+// NO_SMAP_DUMP
 import test.*
 
 fun box(): String {
     return inlineFun("OK")
 }
 
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineFun$1
-*L
-1#1,9:1
-*E
-
-// SMAP_FILE: 2.TODO

compiler/testData/codegen/boxInline/smap/defaultFunction.smap

@@ -0,0 +1,12 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$inlineFun$1
+*L
+1#1,10:1
+*E
+

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

@@ -18,44 +18,3 @@ fun box(): String {
     return inlineFun()
 }
 
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt
-*L
-1#1,14:1
-5#1:15
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/_1Kt
-*L
-11#1:15
-*E
-
-// SMAP_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
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-5#1:9,4
-5#1:13
-*E

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

@@ -0,0 +1,42 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt
+*L
+1#1,14:1
+5#1:15
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt
+*L
+11#1:15
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,21:1
+8#2,4:22
+5#2:26
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+18#1:22,4
+18#1:26
+*E
+

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

@@ -1,3 +1,4 @@
+// SEPARATE_SMAP_DUMPS
 // SKIP_INLINE_CHECK_IN: lParams$default
 
 // FILE: 1.kt
@@ -42,146 +43,3 @@ import test.*
 fun box(): String {
     return lParams()
 }
-
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,39:1
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1$1
-+ 2 1.kt
-test/_1Kt
-*L
-1#1,39:1
-30#2:40
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1$1
-*L
-33#1:40
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$1
-+ 2 1.kt
-test/_1Kt$lParams$1$1
-*L
-1#1,39:1
-33#2:40
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$1
-*L
-1#1,39:1
-*E
-
-// SMAP_FILE: 2.smap-nonseparate-compilation
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-+ 3 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,8:1
-32#2,5:9
-33#3:14
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-5#1:9,5
-5#1:14
-*E
-
-// SMAP_FILE: 2.smap-separate-compilation
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-+ 3 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,8:1
-32#2,5:9
-33#3:14
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-5#1:9,5
-5#1:14
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1$1
-+ 2 1.kt
-test/_1Kt
-*L
-1#1,39:1
-30#2:40
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1$1
-*L
-33#1:40
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$1
-+ 2 1.kt
-test/_1Kt$lParams$1$1
-*L
-1#1,39:1
-33#2:40
-*E

compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-nonseparate-compilation

@@ -0,0 +1,82 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,40:1
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$lParams$1$1
++ 2 1.kt
+test/_1Kt
+*L
+1#1,40:1
+31#2:41
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt$lParams$1$1
+*L
+34#1:41
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
++ 2 1.kt
+test/_1Kt$lParams$1$1
+*L
+1#1,40:1
+34#2:41
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
+*L
+1#1,40:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
++ 3 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,46:1
+33#2,5:47
+34#3:52
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+44#1:47,5
+44#1:52
+*E
+

compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-separate-compilation

@@ -0,0 +1,116 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,40:1
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$lParams$1$1
++ 2 1.kt
+test/_1Kt
+*L
+1#1,40:1
+31#2:41
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt$lParams$1$1
+*L
+34#1:41
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
++ 2 1.kt
+test/_1Kt$lParams$1$1
+*L
+1#1,40:1
+34#2:41
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
+*L
+1#1,40:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
++ 3 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,46:1
+33#2,5:47
+34#3:52
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+44#1:47,5
+44#1:52
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$lParams$1$1
++ 2 1.kt
+test/_1Kt
+*L
+1#1,40:1
+31#2:41
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt$lParams$1$1
+*L
+34#1:41
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
++ 2 1.kt
+test/_1Kt$lParams$1$1
+*L
+1#1,40:1
+34#2:41
+*E
+

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

@@ -44,52 +44,3 @@ fun box(): String {
         lParams()
     }
 }
-
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-+ 2 1.kt
-test/_1Kt
-*L
-1#1,39:1
-30#2:40
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-*L
-33#1:40
-*E
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-+ 3 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,10:1
-32#2,5:11
-30#2:17
-33#3:16
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-6#1:11,5
-6#1:17
-6#1:16
-*E

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

@@ -0,0 +1,48 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
++ 2 1.kt
+test/_1Kt
+*L
+1#1,39:1
+30#2:40
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
+*L
+33#1:40
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
++ 3 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,47:1
+32#2,5:48
+30#2:54
+33#3:53
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+44#1:48,5
+44#1:54
+44#1:53
+*E
+

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

@@ -80,54 +80,3 @@ fun box(): String {
         lParams()
     }
 }
-
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-+ 2 1.kt
-test/_1Kt
-*L
-1#1,75:1
-30#2:76
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-*L
-51#1:76
-*E
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-+ 3 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,10:1
-32#2:11
-71#2,2:12
-30#2:15
-51#3:14
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-6#1:11
-6#1:12,2
-6#1:15
-6#1:14
-*E

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

@@ -0,0 +1,50 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
++ 2 1.kt
+test/_1Kt
+*L
+1#1,75:1
+30#2:76
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
+*L
+51#1:76
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
++ 3 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,83:1
+32#2:84
+71#2,2:85
+30#2:88
+51#3:87
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+80#1:84
+80#1:85,2
+80#1:88
+80#1:87
+*E
+

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

@@ -1,3 +1,4 @@
+// SEPARATE_SMAP_DUMPS
 // SKIP_INLINE_CHECK_IN: lParams$default
 // IGNORE_BACKEND: JS
 
@@ -43,119 +44,3 @@ import test.*
 fun box(): String {
     return lParams()
 }
-
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-+ 2 1.kt
-test/_1Kt
-*L
-1#1,40:1
-31#2:41
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-*L
-34#1:41
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$1
-+ 2 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,40:1
-34#2:41
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$1
-*L
-1#1,40:1
-*E
-
-// SMAP_FILE: 2.smap-nonseparate-compilation
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-+ 3 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,8:1
-33#2,5:9
-31#2:15
-34#3:14
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-5#1:9,5
-5#1:15
-5#1:14
-*E
-
-// SMAP_FILE: 2.smap-separate-compilation
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-+ 3 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,8:1
-33#2,5:9
-31#2:15
-34#3:14
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-5#1:9,5
-5#1:15
-5#1:14
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$1
-+ 2 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,40:1
-34#2:41
-*E

compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-nonseparate-compilation

@@ -0,0 +1,73 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
++ 2 1.kt
+test/_1Kt
+*L
+1#1,41:1
+32#2:42
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
+*L
+35#1:42
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
++ 2 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,41:1
+35#2:42
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
+*L
+1#1,41:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
++ 3 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,47:1
+34#2,5:48
+32#2:54
+35#3:53
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+45#1:48,5
+45#1:54
+45#1:53
+*E
+

compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-separate-compilation

@@ -0,0 +1,87 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
++ 2 1.kt
+test/_1Kt
+*L
+1#1,41:1
+32#2:42
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
+*L
+35#1:42
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
++ 2 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,41:1
+35#2:42
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
+*L
+1#1,41:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
++ 3 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,47:1
+34#2,5:48
+32#2:54
+35#3:53
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+45#1:48,5
+45#1:54
+45#1:53
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
++ 2 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,41:1
+35#2:42
+*E
+

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

@@ -1,3 +1,4 @@
+// SEPARATE_SMAP_DUMPS
 // SKIP_INLINE_CHECK_IN: lParams$default
 // IGNORE_BACKEND: JS
 
@@ -45,118 +46,3 @@ fun box(): String {
         lParams()
     }
 }
-
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-+ 2 1.kt
-test/_1Kt
-*L
-1#1,40:1
-31#2:41
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-*L
-34#1:41
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$1
-+ 2 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,40:1
-34#2:41
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$1
-*L
-1#1,40:1
-*E
-
-// SMAP_FILE: 2.smap-nonseparate-compilation
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-+ 3 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,10:1
-33#2,5:11
-31#2:17
-34#3:16
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-6#1:11,5
-6#1:17
-6#1:16
-*E
-
-// SMAP_FILE: 2.smap-separate-compilation
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-+ 3 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,10:1
-33#2,5:11
-31#2:17
-34#3:16
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-6#1:11,5
-6#1:17
-6#1:16
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$kValue$1
-+ 2 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,40:1
-34#2:41
-*E

compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-nonseparate-compilation

@@ -0,0 +1,73 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
++ 2 1.kt
+test/_1Kt
+*L
+1#1,41:1
+32#2:42
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
+*L
+35#1:42
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
++ 2 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,41:1
+35#2:42
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
+*L
+1#1,41:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
++ 3 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,49:1
+34#2,5:50
+32#2:56
+35#3:55
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+46#1:50,5
+46#1:56
+46#1:55
+*E
+

compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-separate-compilation

@@ -0,0 +1,87 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
++ 2 1.kt
+test/_1Kt
+*L
+1#1,41:1
+32#2:42
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
+*L
+35#1:42
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
++ 2 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,41:1
+35#2:42
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
+*L
+1#1,41:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
++ 3 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,49:1
+34#2,5:50
+32#2:56
+35#3:55
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+46#1:50,5
+46#1:56
+46#1:55
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$kValue$1
++ 2 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,41:1
+35#2:42
+*E
+

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

@@ -43,41 +43,3 @@ fun box(): String {
         lParams()
     }
 }
-
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,38:1
-*E
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-+ 3 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,10:1
-31#2,5:11
-32#3:16
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-6#1:11,5
-6#1:16
-*E

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

@@ -0,0 +1,37 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,38:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
++ 3 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,46:1
+31#2,5:47
+32#3:52
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+43#1:47,5
+43#1:52
+*E
+

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

@@ -17,62 +17,3 @@ import test.*
 fun box(): String {
     return inlineFun("OK")
 }
-
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineFun$2
-*L
-1#1,13:1
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineFun$1
-*L
-1#1,13:1
-*E
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-*L
-1#1,9:1
-7#2,2:10
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-6#1:10,2
-*E
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineFun$2
-+ 2 1.kt
-test/_1Kt$inlineFun$1
-*L
-1#1,13:1
-7#2:14
-*E

compiler/testData/codegen/boxInline/smap/defaultLambda/nested.smap

@@ -0,0 +1,58 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$inlineFun$2
+*L
+1#1,13:1
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$inlineFun$1
+*L
+1#1,13:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,20:1
+7#2,2:21
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+18#1:21,2
+*E
+
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$inlineFun$2
++ 2 1.kt
+test/_1Kt$inlineFun$1
+*L
+1#1,13:1
+7#2:14
+*E
+

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

@@ -15,41 +15,3 @@ import test.*
 fun box(): String {
     return inlineFun("OK")
 }
-
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$inlineFun$1
-*L
-1#1,11:1
-*E
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-+ 3 1.kt
-test/_1Kt$inlineFun$1
-*L
-1#1,9:1
-7#2,2:10
-7#3:12
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-6#1:10,2
-6#1:12
-*E

compiler/testData/codegen/boxInline/smap/defaultLambda/simple.smap

@@ -0,0 +1,37 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$inlineFun$1
+*L
+1#1,11:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
++ 3 1.kt
+test/_1Kt$inlineFun$1
+*L
+1#1,18:1
+7#2,2:19
+7#3:21
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+16#1:19,2
+16#1:21
+*E
+

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

@@ -41,41 +41,3 @@ import test.*
 fun box(): String {
     return lParams()
 }
-
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,38:1
-*E
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-+ 3 1.kt
-test/_1Kt$lParams$1
-*L
-1#1,8:1
-31#2,5:9
-32#3:14
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-5#1:9,5
-5#1:14
-*E

compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.smap

@@ -0,0 +1,37 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,38:1
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
++ 3 1.kt
+test/_1Kt$lParams$1
+*L
+1#1,44:1
+31#2,5:45
+32#3:50
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+42#1:45,5
+42#1:50
+*E
+

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

@@ -35,27 +35,3 @@ class SomeIterator {
         return "OK"
     }
 }
-
-
-// SMAP_FILE: 1.smap
-
-// SMAP_FILE: 2.smap
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 2.kt
-SomeIterator
-*L
-1#1,31:1
-21#2,6:32
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-5#1:32,6
-*E

compiler/testData/codegen/boxInline/smap/forInline.smap

@@ -0,0 +1,22 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 2.kt
+SomeIterator
+*L
+1#1,38:1
+30#2,6:39
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+14#1:39,6
+*E

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

@@ -11,5 +11,3 @@ inline fun stub() {
 fun box(): String {
     return "KO".reversed()
 }
-
-// SMAP_FILE: 2.smap

compiler/testData/codegen/boxInline/smap/inlineOnly/noSmap.smap

@@ -0,0 +1,3 @@
+// FILE: 1.kt
+
+// FILE: 2.kt

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

@@ -17,5 +17,3 @@ import test.*
 fun box(): String {
     return prop
 }
-
-// SMAP_FILE: 2.smap

compiler/testData/codegen/boxInline/smap/inlineOnly/noSmapWithProperty.smap

@@ -0,0 +1,3 @@
+// FILE: 1.kt
+
+// FILE: 2.kt

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

@@ -15,25 +15,3 @@ fun box(): String {
 
     return "OK"
 }
-
-// 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
-6#2:13
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-6#1:13
-*E

compiler/testData/codegen/boxInline/smap/inlineOnly/reified.smap

@@ -0,0 +1,22 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,18:1
+6#2:19
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+13#1:19
+*E

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

@@ -15,25 +15,3 @@ fun box(): String {
 
     return "OK"
 }
-
-// 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
-6#2:13
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-6#1:13
-*E

compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.smap

@@ -0,0 +1,23 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,18:1
+6#2:19
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+13#1:19
+*E
+

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

@@ -19,6 +19,5 @@ fun box(): String {
     })
 }
 
-// SMAP_FILE: 2.smap
 // See KT-23064 for the problem, InlineOnlySmapSkipper for an explanation, and
 // `stdlibInlineOnlyOneLine.kt` for the case where something should actually happen.

compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnly.smap

@@ -0,0 +1,3 @@
+// FILE: 1.kt
+
+// FILE: 2.kt

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

@@ -14,18 +14,4 @@ fun box(): String {
     return "O".myLet(fun (it: String): String { return it + k })
 }
 
-// SMAP_FILE: 2.smap
 // See KT-23064 for the problem and InlineOnlySmapSkipper for an explanation.
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 fake.kt
-kotlin/jvm/internal/FakeKt
-*L
-1#1,9:1
-1#2:10
-*E

compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnlyOneLine.smap

@@ -0,0 +1,16 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 fake.kt
+kotlin/jvm/internal/FakeKt
+*L
+1#1,18:1
+1#2:19
+*E

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

@@ -19,37 +19,3 @@ fun box(): String {
     return "OK"
 }
 
-// SMAP_FILE: 1.smap
-
-// SMAP_FILE: 2.smap
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-*L
-1#1,17:1
-4#1:19
-7#1:21
-8#1:23
-4#1,7:24
-4#2:18
-4#2:20
-4#2:22
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-8#1:19
-13#1:21
-13#1:23
-13#1:24,7
-7#1:18
-9#1:20
-13#1:22
-*E

compiler/testData/codegen/boxInline/smap/interleavedFiles.smap

@@ -0,0 +1,35 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,22:1
+9#1:24
+12#1:26
+13#1:28
+9#1,7:29
+4#2:23
+4#2:25
+4#2:27
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+13#1:24
+18#1:26
+18#1:28
+18#1:29,7
+12#1:23
+14#1:25
+18#1:27
+*E
+

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

@@ -1,4 +1,3 @@
-
 // FILE: 1+a.kt
 
 package test
@@ -13,27 +12,3 @@ import test.*
 fun box(): String {
     return inlineFun { "OK" }
 }
-
-// SMAP_FILE: 1+a.smap
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1+a.kt
-test/_1_aKt
-*L
-1#1,8:1
-7#2:9
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-5#1:9
-*E

compiler/testData/codegen/boxInline/smap/kt23369.smap

@@ -0,0 +1,23 @@
+// FILE: 1+a.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1+a.kt
+test/_1_aKt
+*L
+1#1,15:1
+6#2:16
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+13#1:16
+*E
+

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

@@ -1,4 +1,3 @@
-
 // FILE: a.kt
 
 package test
@@ -13,27 +12,3 @@ import test.*
 fun box(): String {
     return inlineFun { "OK" }
 }
-
-// SMAP_FILE: 1+ a.smap
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1+ a.kt
-test/_1__aKt
-*L
-1#1,8:1
-7#2:9
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-5#1:9
-*E

compiler/testData/codegen/boxInline/smap/kt23369_2.smap

@@ -0,0 +1,23 @@
+// FILE: a.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 a.kt
+test/AKt
+*L
+1#1,15:1
+6#2:16
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+13#1:16
+*E
+

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

@@ -1,4 +1,3 @@
-
 // FILE: a.kt
 
 package test
@@ -13,27 +12,3 @@ import test.*
 fun box(): String {
     return inlineFun { "OK" }
 }
-
-// SMAP_FILE: + a.smap
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 + a.kt
-test/__aKt
-*L
-1#1,8:1
-7#2:9
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-5#1:9
-*E

compiler/testData/codegen/boxInline/smap/kt23369_3.smap

@@ -0,0 +1,23 @@
+// FILE: a.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 a.kt
+test/AKt
+*L
+1#1,15:1
+6#2:16
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+13#1:16
+*E
+

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

@@ -14,30 +14,3 @@ fun box(): String {  // KotlinDebug:
         "OK"
     }
 }
-
-// SMAP_FILE: 1.smap
-
-// 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
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-5#1:13
-6#1:14
-7#1:15
-*E

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

@@ -0,0 +1,27 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,17:1
+5#2:18
+4#2:19
+4#2:20
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+11#1:18
+12#1:19
+13#1:20
+*E
+

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

@@ -13,43 +13,3 @@ inline fun foo2(l: () -> String): String = foo(l)
 // FILE: 2.kt
 
 fun box(): String = foo { "OK" }
-
-// SMAP_FILE: 1.smap
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-Facade___1Kt
-*L
-1#1,13:1
-8#1:14
-*S KotlinDebug
-*F
-+ 1 1.kt
-Facade___1Kt
-*L
-10#1:14
-*E
-
-// SMAP_FILE: 2.smap
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-Facade___1Kt
-*L
-1#1,5:1
-8#2:6
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-3#1:6
-*E

compiler/testData/codegen/boxInline/smap/multiFileFacade.smap

@@ -0,0 +1,40 @@
+// FILE: 1.kt
+SMAP
+1.kt
+Kotlin
+*S Kotlin
+*F
++ 1 1.kt
+Facade___1Kt
+*L
+1#1,13:1
+8#1:14
+*S KotlinDebug
+*F
++ 1 1.kt
+Facade___1Kt
+*L
+10#1:14
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+Facade___1Kt
+*L
+1#1,16:1
+8#2:17
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+15#1:17
+*E
+

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

@@ -1,4 +1,3 @@
-
 // FILE: 1.kt
 
 package test
@@ -26,29 +25,3 @@ fun box(): String {
 
     return result
 }
-
-// SMAP_FILE: 1.smap
-
-// 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
-7#2,4:19
-7#2,4:23
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-7#1:19,4
-11#1:23,4
-*E

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

@@ -0,0 +1,25 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,28:1
+6#2,4:29
+6#2,4:33
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+18#1:29,4
+22#1:33,4
+*E
+

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

@@ -1,4 +1,3 @@
-
 // FILE: 1.kt
 
 package test
@@ -29,73 +28,3 @@ fun box(): String {
 
     return result
 }
-
-
-// SMAP_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,19:1
-7#2,3:20
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/_1Kt$test$1
-*L
-14#1:20,3
-*E
-
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-test/_1Kt
-*L
-1#1,16:1
-12#2,6:17
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-8#1:17,6
-*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,19:1
-7#2,2:20
-9#2:24
-9#3,2:22
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/_1Kt$test$1
-*L
-14#1:20,2
-14#1:24
-*E

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

@@ -0,0 +1,67 @@
+// FILE: 1.kt
+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
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt$test$1
+*L
+13#1:19,3
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,31:1
+11#2,6:32
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+25#1:32,6
+*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,2:19
+8#2:23
+26#3,2:21
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt$test$1
+*L
+13#1:19,2
+13#1:23
+*E
+

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

@@ -1,4 +1,3 @@
-
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 package test
@@ -32,48 +31,3 @@ fun box(): String {
 
     return result
 }
-
-
-// SMAP_FILE: 1.smap
-
-// 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
-7#2,4:21
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-8#1:21,4
-*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
-13#2,3:21
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt$box$1$1
-*L
-10#1:21,3
-*E

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

@@ -0,0 +1,43 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,34:1
+6#2,4:35
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+24#1:35,4
+*E
+
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt$box$1$1
++ 2 1.kt
+test/_1Kt
+*L
+1#1,34:1
+12#2,3:35
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt$box$1$1
+*L
+26#1:35,3
+*E
+

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

@@ -1,4 +1,3 @@
-
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 package test
@@ -32,48 +31,3 @@ fun box(): String {
 
     return result
 }
-
-
-// SMAP_FILE: 1.smap
-
-// 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
-7#2,4:27
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-14#1:27,4
-*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
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt$box$1$1
-*L
-16#1:27,3
-*E

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

@@ -0,0 +1,43 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,34:1
+6#2,4:35
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+24#1:35,4
+*E
+
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt$box$1$1
++ 2 2.kt
+_2Kt
+*L
+1#1,34:1
+16#2,3:35
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt$box$1$1
+*L
+26#1:35,3
+*E
+

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

@@ -1,4 +1,3 @@
-
 // FILE: 1.kt
 
 package zzz
@@ -18,26 +17,3 @@ inline fun test(p: () -> String): String {
     pd = "O"
     return pd + p()
 }
-
-// SMAP_FILE: 1.smap
-
-// SMAP_FILE: 2.smap
-
-//TODO should be empty
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-*L
-1#1,15:1
-10#1,3:16
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-4#1:16,3
-*E

compiler/testData/codegen/boxInline/smap/oneFile.smap

@@ -0,0 +1,21 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
+*L
+1#1,20:1
+16#1,3:21
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+10#1:21,3
+*E
+

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

@@ -26,49 +26,3 @@ fun box(): String {
     together()
     return "OK"
 }
-
-// SMAP_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
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/_1Kt
-*L
-9#1:15
-10#1:16
-11#1:17
-*E
-
-// SMAP_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
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-13#1:18
-13#1:19,9
-*E

compiler/testData/codegen/boxInline/smap/rangeFolding.smap

@@ -0,0 +1,46 @@
+// FILE: 1.kt
+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
+*S KotlinDebug
+*F
++ 1 1.kt
+test/_1Kt
+*L
+9#1:15
+10#1:16
+11#1:17
+*E
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+test/_1Kt
+*L
+1#1,29:1
+9#2:30
+4#2,9:31
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+26#1:30
+26#1:31,9
+*E
+

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

@@ -28,71 +28,3 @@ fun box(): String {
     X.foo()
     return "OK"
 }
-
-// SMAP_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
-*S KotlinDebug
-*F
-+ 1 1.kt
-test/D
-*L
-10#1:17
-11#1:18
-12#1:19
-*E
-
-// SMAP_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
-*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/rangeFoldingInClass.smap

@@ -0,0 +1,68 @@
+// FILE: 1.kt
+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
+*S KotlinDebug
+*F
++ 1 1.kt
+test/D
+*L
+10#1:17
+11#1:18
+12#1:19
+*E
+
+// FILE: 2.kt
+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,31:1
+10#2:32
+11#2:34
+12#2:36
+13#2:38
+4#3:33
+6#4:35
+5#5:37
+*S KotlinDebug
+*F
++ 1 2.kt
+X
+*L
+24#1:32
+24#1:34
+24#1:36
+24#1:38
+24#1:33
+24#1:35
+24#1:37
+*E
+

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

@@ -17,27 +17,3 @@ fun box(): String {
 
     return if (p == 1 && l == 11) "OK" else "fail: $p"
 }
-
-// SMAP_FILE: 1.smap
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-zzz/_1Kt
-*L
-1#1,11:1
-7#2,3:12
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-6#1:12,3
-*E

compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.smap

@@ -0,0 +1,23 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+zzz/_1Kt
+*L
+1#1,20:1
+7#2,3:21
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+16#1:21,3
+*E
+

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

@@ -18,27 +18,3 @@ fun box(): String {
 
     return if (p == 15) "OK" else "fail: $p"
 }
-
-// SMAP_FILE: 1.smap
-
-// SMAP_FILE: 2.smap
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-zzz/_1Kt
-*L
-1#1,14:1
-7#2:15
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-7#1:15
-*E

compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.smap

@@ -0,0 +1,23 @@
+// FILE: 1.kt
+
+// FILE: 2.kt
+SMAP
+2.kt
+Kotlin
+*S Kotlin
+*F
++ 1 2.kt
+_2Kt
++ 2 1.kt
+zzz/_1Kt
+*L
+1#1,21:1
+7#2:22
+*S KotlinDebug
+*F
++ 1 2.kt
+_2Kt
+*L
+15#1:22
+*E
+

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

@@ -42,78 +42,3 @@ fun box(): String {
 
     return expected
 }
-
-// SMAP_FILE: 1.smap
-
-SMAP
-1.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 1.kt
-builders/_1Kt
-*L
-1#1,22:1
-11#1,3:23
-7#1,2:26
-*S KotlinDebug
-*F
-+ 1 1.kt
-builders/_1Kt
-*L
-15#1:23,3
-19#1:26,2
-*E
-
-// SMAP_FILE: 2.smap
-
-
-SMAP
-2.kt
-Kotlin
-*S Kotlin
-*F
-+ 1 2.kt
-_2Kt
-+ 2 1.kt
-builders/_1Kt
-*L
-1#1,25:1
-7#1,3:33
-10#1:38
-11#1,2:42
-13#1:45
-15#1:47
-19#2:26
-7#2:27
-15#2:28
-11#2,3:29
-8#2:32
-19#2:36
-7#2:37
-15#2:39
-11#2,2:40
-13#2:44
-8#2:46
-*S KotlinDebug
-*F
-+ 1 2.kt
-_2Kt
-*L
-20#1:33,3
-20#1:38
-20#1:42,2
-20#1:45
-20#1:47
-9#1:26
-9#1:27
-10#1:28
-10#1:29,3
-9#1:32
-20#1:36
-20#1:37
-20#1:39
-20#1:40,2
-20#1:44
-20#1:46
-*E