diff --git a/compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.kt b/compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.kt
index 52d6d1efcd2..f8d3d179c08 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.kt
@@ -47,13 +47,12 @@ test/B
 *L
 1#1,19:1
 13#2,2:20
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-9#1,2:20
+9#1:20,2
 *E
 
 SMAP
@@ -68,11 +67,10 @@ test/A
 *L
 1#1,19:1
 7#2,2:20
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt$box$1$1
 *L
-11#1,2:20
-*E
\ No newline at end of file
+11#1:20,2
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.kt b/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.kt
index effe64c557e..e7aeaec4f71 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.kt
@@ -56,7 +56,6 @@ test/Introspector$SchemaRetriever
 *L
 1#1,21:1
 8#2:22
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
@@ -77,4 +76,4 @@ IntrospectorImpl$SchemaRetriever
 *L
 1#1,12:1
 9#2:13
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt b/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt
index 652017a989c..1690def94fa 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt
@@ -56,7 +56,6 @@ builders/_1Kt
 *L
 1#1,21:1
 7#2:22
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt
index 0510224c672..53e46025ae0 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt
@@ -46,11 +46,10 @@ builders/_1Kt
 *L
 1#1,23:1
 7#2:24
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
 9#1:24
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt
index c2d46b18725..949f01e9968 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt
@@ -53,14 +53,13 @@ builders/_1Kt
 10#1,6:30
 7#2:25
 7#2:29
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-20#1,3:26
-20#1,6:30
+20#1:26,3
+20#1:30,6
 9#1:25
 20#1:29
 *E
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/object.kt b/compiler/testData/codegen/boxInline/smap/anonymous/object.kt
index abda5de5a05..5e410c30c0a 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/object.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/object.kt
@@ -59,13 +59,12 @@ builders/_1Kt
 *L
 1#1,22:1
 7#2,5:23
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-9#1,5:23
+9#1:23,5
 *E
 
 SMAP
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.kt
index 881bf7312ec..eabbb2ea24c 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.kt
@@ -49,11 +49,10 @@ builders/_1Kt
 *L
 1#1,26:1
 7#2:27
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
 9#1:27
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt
index 003692af4e2..fae9a58df06 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt
@@ -54,14 +54,13 @@ builders/_1Kt
 10#1,8:32
 7#2:27
 7#2:31
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-22#1,3:28
-22#1,8:32
+22#1:28,3
+22#1:32,8
 9#1:27
 22#1:31
 *E
diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt b/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt
index 03c7864a230..544454d615c 100644
--- a/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt
+++ b/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt
@@ -46,7 +46,6 @@ test/_1Kt
 1#1,18:1
 10#2:19
 6#2:20
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
@@ -73,7 +72,6 @@ _2Kt
 10#2:20
 15#2:22
 7#3:21
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
@@ -81,4 +79,4 @@ test/_1Kt$annotatedWith2$1
 *L
 6#1:19
 6#1:22
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/assertion.kt b/compiler/testData/codegen/boxInline/smap/assertion.kt
index 1ea060dc8ee..779611b7b2c 100644
--- a/compiler/testData/codegen/boxInline/smap/assertion.kt
+++ b/compiler/testData/codegen/boxInline/smap/assertion.kt
@@ -53,12 +53,11 @@ test/_1Kt
 1#1,14:1
 18#2,7:15
 9#2,7:22
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-6#1,7:15
-7#1,7:22
-*E
\ No newline at end of file
+6#1:15,7
+7#1:22,7
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/classCycle.kt b/compiler/testData/codegen/boxInline/smap/classCycle.kt
index e0af8c1e80c..7c6f7ac5bf9 100644
--- a/compiler/testData/codegen/boxInline/smap/classCycle.kt
+++ b/compiler/testData/codegen/boxInline/smap/classCycle.kt
@@ -30,7 +30,6 @@ test/A
 1#1,14:1
 11#1:16
 6#2:15
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
@@ -55,7 +54,6 @@ test/B
 10#2:15
 11#2:17
 11#2:18
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
@@ -85,7 +83,6 @@ test/B
 6#2:9
 10#3:8
 11#3:10
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
diff --git a/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.kt b/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.kt
index 8e1691d5627..fe9b11919d2 100644
--- a/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.kt
+++ b/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.kt
@@ -26,11 +26,10 @@ A
 *L
 1#1,9:1
 4#2:10
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
 4#1:10
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/crossroutines.kt b/compiler/testData/codegen/boxInline/smap/crossroutines.kt
index 787edabc791..23b3608f04c 100644
--- a/compiler/testData/codegen/boxInline/smap/crossroutines.kt
+++ b/compiler/testData/codegen/boxInline/smap/crossroutines.kt
@@ -96,14 +96,13 @@ test/_1Kt
 1#1,29:1
 12#2,5:30
 19#2,3:35
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt$box$1
 *L
-19#1,5:30
-22#1,3:35
+19#1:30,5
+22#1:35,3
 *E
 
 SMAP
@@ -132,4 +131,4 @@ _2Kt$box$1
 *L
 1#1,23:1
 20#2,2:24
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt b/compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt
index a9f655ae4d2..cab3ac62c0d 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt
@@ -29,7 +29,6 @@ test/_1Kt
 *L
 1#1,14:1
 5#1:15
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
@@ -52,12 +51,11 @@ test/_1Kt
 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:9,4
 5#1:13
 *E
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt
index 92497a2de52..c06c6e1ecb2 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt
@@ -67,7 +67,6 @@ test/_1Kt
 *L
 1#1,39:1
 30#2:40
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
@@ -118,13 +117,12 @@ test/_1Kt$lParams$1
 1#1,8:1
 32#2,5:9
 33#3:14
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-5#1,5:9
+5#1:9,5
 5#1:14
 *E
 
@@ -145,13 +143,12 @@ test/_1Kt$lParams$1
 1#1,8:1
 32#2,5:9
 33#3:14
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-5#1,5:9
+5#1:9,5
 5#1:14
 *E
 
@@ -167,7 +164,6 @@ test/_1Kt
 *L
 1#1,39:1
 30#2:40
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
@@ -188,4 +184,4 @@ test/_1Kt$lParams$1$1
 *L
 1#1,39:1
 33#2:40
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.kt
index ba999813acc..b6925a7206a 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.kt
@@ -58,7 +58,6 @@ test/_1Kt
 *L
 1#1,39:1
 30#2:40
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
@@ -85,13 +84,12 @@ test/_1Kt$lParams$1
 32#2,5:11
 30#2:17
 33#3:16
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-6#1,5:11
+6#1:11,5
 6#1:17
 6#1:16
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.kt
index 292de81ad16..9deda9047a2 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.kt
@@ -94,7 +94,6 @@ test/_1Kt
 *L
 1#1,75:1
 30#2:76
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
@@ -122,14 +121,13 @@ test/_1Kt$lParams$1
 71#2,2:12
 30#2:15
 51#3:14
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
 6#1:11
-6#1,2:12
+6#1:12,2
 6#1:15
 6#1:14
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt
index 5f9c5c57a75..a5496dd3c34 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt
@@ -57,7 +57,6 @@ test/_1Kt
 *L
 1#1,40:1
 31#2:41
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
@@ -109,13 +108,12 @@ test/_1Kt$lParams$1
 33#2,5:9
 31#2:15
 34#3:14
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-5#1,5:9
+5#1:9,5
 5#1:15
 5#1:14
 *E
@@ -138,13 +136,12 @@ test/_1Kt$lParams$1
 33#2,5:9
 31#2:15
 34#3:14
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-5#1,5:9
+5#1:9,5
 5#1:15
 5#1:14
 *E
@@ -161,4 +158,4 @@ test/_1Kt$lParams$1
 *L
 1#1,40:1
 34#2:41
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt
index 6aff50bbdbb..e4a0d619da3 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt
@@ -59,7 +59,6 @@ test/_1Kt
 *L
 1#1,40:1
 31#2:41
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
@@ -111,13 +110,12 @@ test/_1Kt$lParams$1
 33#2,5:11
 31#2:17
 34#3:16
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-6#1,5:11
+6#1:11,5
 6#1:17
 6#1:16
 *E
@@ -139,13 +137,12 @@ test/_1Kt$lParams$1
 33#2,5:11
 31#2:17
 34#3:16
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-6#1,5:11
+6#1:11,5
 6#1:17
 6#1:16
 *E
@@ -162,4 +159,4 @@ test/_1Kt$lParams$1
 *L
 1#1,40:1
 34#2:41
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.kt
index a8181437f6b..793f1f6f49d 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.kt
@@ -73,12 +73,11 @@ test/_1Kt$lParams$1
 1#1,10:1
 31#2,5:11
 32#3:16
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-6#1,5:11
+6#1:11,5
 6#1:16
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt
index 59fd3929bde..ba04e586364 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt
@@ -55,13 +55,12 @@ test/_1Kt
 *L
 1#1,9:1
 7#2,2:10
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-6#1,2:10
+6#1:10,2
 *E
 
 SMAP
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.kt
index 410ca97bc99..e54918f3aaa 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.kt
@@ -45,12 +45,11 @@ test/_1Kt$inlineFun$1
 1#1,9:1
 7#2,2:10
 7#3:12
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-6#1,2:10
+6#1:10,2
 6#1:12
 *E
diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.kt
index 92516833845..82d37489a0e 100644
--- a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.kt
+++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.kt
@@ -71,12 +71,11 @@ test/_1Kt$lParams$1
 1#1,8:1
 31#2,5:9
 32#3:14
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-5#1,5:9
+5#1:9,5
 5#1:14
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.kt b/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.kt
index 6294cba14ae..c12d2cdc6bf 100644
--- a/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.kt
+++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.kt
@@ -30,11 +30,10 @@ test/_1Kt
 *L
 1#1,12:1
 6#2:13
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
 6#1:13
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.kt b/compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.kt
index 2b8886c7666..cee0ed27120 100644
--- a/compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.kt
+++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.kt
@@ -30,11 +30,10 @@ test/_1Kt
 *L
 1#1,12:1
 6#2:13
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
 6#1:13
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/interleavedFiles.kt b/compiler/testData/codegen/boxInline/smap/interleavedFiles.kt
index e86b9d6aa02..0ad34b218a5 100644
--- a/compiler/testData/codegen/boxInline/smap/interleavedFiles.kt
+++ b/compiler/testData/codegen/boxInline/smap/interleavedFiles.kt
@@ -40,7 +40,6 @@ test/_1Kt
 4#2:18
 4#2:20
 4#2:22
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
@@ -49,7 +48,7 @@ _2Kt
 8#1:19
 13#1:21
 13#1:23
-13#1,7:24
+13#1:24,7
 7#1:18
 9#1:20
 13#1:22
diff --git a/compiler/testData/codegen/boxInline/smap/kt23369.kt b/compiler/testData/codegen/boxInline/smap/kt23369.kt
index 319de860248..ad4dc7aacb1 100644
--- a/compiler/testData/codegen/boxInline/smap/kt23369.kt
+++ b/compiler/testData/codegen/boxInline/smap/kt23369.kt
@@ -30,11 +30,10 @@ test/_1_aKt
 *L
 1#1,8:1
 7#2:9
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
 5#1:9
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/kt23369_2.kt b/compiler/testData/codegen/boxInline/smap/kt23369_2.kt
index c61d7a7d015..5056bf17280 100644
--- a/compiler/testData/codegen/boxInline/smap/kt23369_2.kt
+++ b/compiler/testData/codegen/boxInline/smap/kt23369_2.kt
@@ -30,11 +30,10 @@ test/_1__aKt
 *L
 1#1,8:1
 7#2:9
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
 5#1:9
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/kt23369_3.kt b/compiler/testData/codegen/boxInline/smap/kt23369_3.kt
index 3205f481144..9cdb1363488 100644
--- a/compiler/testData/codegen/boxInline/smap/kt23369_3.kt
+++ b/compiler/testData/codegen/boxInline/smap/kt23369_3.kt
@@ -30,11 +30,10 @@ test/__aKt
 *L
 1#1,8:1
 7#2:9
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
 5#1:9
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/kt35006.kt b/compiler/testData/codegen/boxInline/smap/kt35006.kt
index fb239d66949..6c4480ed3f8 100644
--- a/compiler/testData/codegen/boxInline/smap/kt35006.kt
+++ b/compiler/testData/codegen/boxInline/smap/kt35006.kt
@@ -32,7 +32,6 @@ test/_1Kt
 5#2:13
 4#2:14
 4#2:15
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
diff --git a/compiler/testData/codegen/boxInline/smap/multiFileFacade.kt b/compiler/testData/codegen/boxInline/smap/multiFileFacade.kt
index ae3a53db870..257424317e4 100644
--- a/compiler/testData/codegen/boxInline/smap/multiFileFacade.kt
+++ b/compiler/testData/codegen/boxInline/smap/multiFileFacade.kt
@@ -25,7 +25,6 @@ Facade___1Kt
 *L
 1#1,13:1
 8#1:14
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
@@ -47,11 +46,10 @@ Facade___1Kt
 *L
 1#1,5:1
 8#2:6
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
 3#1:6
-*E
\ No newline at end of file
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.kt b/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.kt
index 34739c8c2b8..6806931d187 100644
--- a/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.kt
+++ b/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.kt
@@ -44,12 +44,11 @@ test/_1Kt
 1#1,18:1
 7#2,4:19
 7#2,4:23
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-7#1,4:19
-11#1,4:23
-*E
\ No newline at end of file
+7#1:19,4
+11#1:23,4
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt
index be59b950177..605f24a02ad 100644
--- a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt
+++ b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt
@@ -44,13 +44,12 @@ test/_1Kt
 *L
 1#1,19:1
 7#2,3:20
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
 test/_1Kt$test$1
 *L
-14#1,3:20
+14#1:20,3
 *E
 
 
@@ -68,13 +67,12 @@ test/_1Kt
 *L
 1#1,16:1
 12#2,6:17
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-8#1,6:17
+8#1:17,6
 *E
 
 SMAP
@@ -93,12 +91,11 @@ _2Kt
 7#2,2:20
 9#2:24
 9#3,2:22
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
 test/_1Kt$test$1
 *L
-14#1,2:20
+14#1:20,2
 14#1:24
 *E
diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.kt b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.kt
index ac06630bb4d..7f7c70cc6f6 100644
--- a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.kt
+++ b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.kt
@@ -50,13 +50,12 @@ test/_1Kt
 *L
 1#1,20:1
 7#2,4:21
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-8#1,4:21
+8#1:21,4
 *E
 
 SMAP
@@ -71,11 +70,10 @@ test/_1Kt
 *L
 1#1,20:1
 13#2,3:21
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt$box$1$1
 *L
-10#1,3:21
-*E
\ No newline at end of file
+10#1:21,3
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.kt b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.kt
index 7cc7ac7e159..22e52e09da1 100644
--- a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.kt
+++ b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.kt
@@ -50,13 +50,12 @@ test/_1Kt
 *L
 1#1,26:1
 7#2,4:27
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-14#1,4:27
+14#1:27,4
 *E
 
 SMAP
@@ -71,11 +70,10 @@ _2Kt
 *L
 1#1,26:1
 6#2,3:27
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt$box$1$1
 *L
-16#1,3:27
-*E
\ No newline at end of file
+16#1:27,3
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/oneFile.kt b/compiler/testData/codegen/boxInline/smap/oneFile.kt
index e725aacd9d6..df2e0247903 100644
--- a/compiler/testData/codegen/boxInline/smap/oneFile.kt
+++ b/compiler/testData/codegen/boxInline/smap/oneFile.kt
@@ -34,11 +34,10 @@ _2Kt
 *L
 1#1,15:1
 10#1,3:16
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-4#1,3:16
+4#1:16,3
 *E
diff --git a/compiler/testData/codegen/boxInline/smap/rangeFolding.kt b/compiler/testData/codegen/boxInline/smap/rangeFolding.kt
index 393f78582b6..6856000760d 100644
--- a/compiler/testData/codegen/boxInline/smap/rangeFolding.kt
+++ b/compiler/testData/codegen/boxInline/smap/rangeFolding.kt
@@ -40,7 +40,6 @@ test/_1Kt
 4#1:15
 6#1:16
 5#1:17
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
@@ -65,12 +64,11 @@ test/_1Kt
 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
+13#1:19,9
 *E
diff --git a/compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt b/compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt
index 506ce7b72f2..c1112c9549b 100644
--- a/compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt
+++ b/compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt
@@ -48,7 +48,6 @@ test/B
 4#2:17
 6#3:18
 5#4:19
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
@@ -84,7 +83,6 @@ test/B
 4#3:19
 6#4:21
 5#5:23
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
diff --git a/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt b/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt
index 8d51446ddad..499cbff507e 100644
--- a/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt
+++ b/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt
@@ -34,11 +34,10 @@ zzz/_1Kt
 *L
 1#1,11:1
 7#2,3:12
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-6#1,3:12
-*E
\ No newline at end of file
+6#1:12,3
+*E
diff --git a/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.kt b/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.kt
index e2453a51e19..031109f2e5b 100644
--- a/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.kt
+++ b/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.kt
@@ -35,7 +35,6 @@ zzz/_1Kt
 *L
 1#1,14:1
 7#2:15
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
diff --git a/compiler/testData/codegen/boxInline/smap/smap.kt b/compiler/testData/codegen/boxInline/smap/smap.kt
index 80b8b2f570a..ba121ab90b2 100644
--- a/compiler/testData/codegen/boxInline/smap/smap.kt
+++ b/compiler/testData/codegen/boxInline/smap/smap.kt
@@ -56,14 +56,13 @@ builders/_1Kt
 1#1,22:1
 11#1,3:23
 7#1,2:26
-*E
 *S KotlinDebug
 *F
 + 1 1.kt
 builders/_1Kt
 *L
-15#1,3:23
-19#1,2:26
+15#1:23,3
+19#1:26,2
 *E
 
 // FILE: 2.smap
@@ -96,26 +95,25 @@ builders/_1Kt
 11#2,2:40
 13#2:44
 8#2:46
-*E
 *S KotlinDebug
 *F
 + 1 2.kt
 _2Kt
 *L
-20#1,3:33
+20#1:33,3
 20#1:38
-20#1,2:42
+20#1:42,2
 20#1:45
 20#1:47
 9#1:26
 9#1:27
 10#1:28
-10#1,3:29
+10#1:29,3
 9#1:32
 20#1:36
 20#1:37
 20#1:39
-20#1,2:40
+20#1:40,2
 20#1:44
 20#1:46
-*E
\ No newline at end of file
+*E